.clang-format

@@ -1,192 +0,0 @@
----
-Language:        Cpp
-# BasedOnStyle:  LLVM
-AccessModifierOffset: -2
-AlignAfterOpenBracket: Align
-AlignArrayOfStructures: None
-AlignConsecutiveMacros: None
-AlignConsecutiveAssignments: None
-AlignConsecutiveBitFields: None
-AlignConsecutiveDeclarations: None
-AlignEscapedNewlines: Right
-AlignOperands:   Align
-AlignTrailingComments: true
-AllowAllArgumentsOnNextLine: true
-AllowAllParametersOfDeclarationOnNextLine: true
-AllowShortEnumsOnASingleLine: true
-AllowShortBlocksOnASingleLine: Never
-AllowShortCaseLabelsOnASingleLine: false
-AllowShortFunctionsOnASingleLine: All
-AllowShortLambdasOnASingleLine: All
-AllowShortIfStatementsOnASingleLine: Never
-AllowShortLoopsOnASingleLine: false
-AlwaysBreakAfterDefinitionReturnType: None
-AlwaysBreakAfterReturnType: None
-AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: MultiLine
-AttributeMacros:
-  - __capability
-BinPackArguments: true
-BinPackParameters: true
-BraceWrapping:
-  AfterCaseLabel:  false
-  AfterClass:      false
-  AfterControlStatement: Never
-  AfterEnum:       false
-  AfterFunction:   false
-  AfterNamespace:  false
-  AfterObjCDeclaration: false
-  AfterStruct:     false
-  AfterUnion:      false
-  AfterExternBlock: false
-  BeforeCatch:     false
-  BeforeElse:      false
-  BeforeLambdaBody: false
-  BeforeWhile:     false
-  IndentBraces:    false
-  SplitEmptyFunction: true
-  SplitEmptyRecord: true
-  SplitEmptyNamespace: true
-BreakBeforeBinaryOperators: None
-BreakBeforeConceptDeclarations: true
-BreakBeforeBraces: Attach
-BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
-BreakBeforeTernaryOperators: true
-BreakConstructorInitializersBeforeComma: false
-BreakConstructorInitializers: BeforeColon
-BreakAfterJavaFieldAnnotations: false
-BreakStringLiterals: true
-ColumnLimit:     140
-CommentPragmas:  '^ IWYU pragma:'
-QualifierAlignment: Leave
-CompactNamespaces: false
-ConstructorInitializerIndentWidth: 4
-ContinuationIndentWidth: 4
-Cpp11BracedListStyle: true
-DeriveLineEnding: true
-DerivePointerAlignment: false
-DisableFormat:   false
-EmptyLineAfterAccessModifier: Never
-EmptyLineBeforeAccessModifier: LogicalBlock
-ExperimentalAutoDetectBinPacking: false
-PackConstructorInitializers: BinPack
-BasedOnStyle:    ''
-ConstructorInitializerAllOnOneLineOrOnePerLine: false
-AllowAllConstructorInitializersOnNextLine: true
-FixNamespaceComments: true
-ForEachMacros:
-  - foreach
-  - Q_FOREACH
-  - BOOST_FOREACH
-IfMacros:
-  - KJ_IF_MAYBE
-IncludeBlocks:   Preserve
-IncludeCategories:
-  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
-    Priority:        2
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
-    Priority:        3
-    SortPriority:    0
-    CaseSensitive:   false
-  - Regex:           '.*'
-    Priority:        1
-    SortPriority:    0
-    CaseSensitive:   false
-IncludeIsMainRegex: '(Test)?$'
-IncludeIsMainSourceRegex: ''
-IndentAccessModifiers: false
-IndentCaseLabels: false
-IndentCaseBlocks: false
-IndentGotoLabels: true
-IndentPPDirectives: None
-IndentExternBlock: AfterExternBlock
-IndentRequires:  false
-IndentWidth:     4
-IndentWrappedFunctionNames: false
-InsertTrailingCommas: None
-JavaScriptQuotes: Leave
-JavaScriptWrapImports: true
-KeepEmptyLinesAtTheStartOfBlocks: true
-LambdaBodyIndentation: Signature
-MacroBlockBegin: ''
-MacroBlockEnd:   ''
-MaxEmptyLinesToKeep: 1
-NamespaceIndentation: None
-ObjCBinPackProtocolList: Auto
-ObjCBlockIndentWidth: 2
-ObjCBreakBeforeNestedBlockParam: true
-ObjCSpaceAfterProperty: false
-ObjCSpaceBeforeProtocolList: true
-PenaltyBreakAssignment: 2
-PenaltyBreakBeforeFirstCallParameter: 19
-PenaltyBreakComment: 300
-PenaltyBreakFirstLessLess: 120
-PenaltyBreakOpenParenthesis: 0
-PenaltyBreakString: 1000
-PenaltyBreakTemplateDeclaration: 10
-PenaltyExcessCharacter: 1000000
-PenaltyReturnTypeOnItsOwnLine: 60
-PenaltyIndentedWhitespace: 0
-PointerAlignment: Right
-PPIndentWidth:   -1
-ReferenceAlignment: Pointer
-ReflowComments:  true
-RemoveBracesLLVM: false
-SeparateDefinitionBlocks: Leave
-ShortNamespaceLines: 1
-SortIncludes:    CaseSensitive
-SortJavaStaticImport: Before
-SortUsingDeclarations: true
-SpaceAfterCStyleCast: false
-SpaceAfterLogicalNot: false
-SpaceAfterTemplateKeyword: true
-SpaceBeforeAssignmentOperators: true
-SpaceBeforeCaseColon: false
-SpaceBeforeCpp11BracedList: false
-SpaceBeforeCtorInitializerColon: true
-SpaceBeforeInheritanceColon: true
-SpaceBeforeParens: ControlStatements
-SpaceBeforeParensOptions:
-  AfterControlStatements: true
-  AfterForeachMacros: true
-  AfterFunctionDefinitionName: false
-  AfterFunctionDeclarationName: false
-  AfterIfMacros:   true
-  AfterOverloadedOperator: false
-  BeforeNonEmptyParentheses: false
-SpaceAroundPointerQualifiers: Default
-SpaceBeforeRangeBasedForLoopColon: true
-SpaceInEmptyBlock: false
-SpaceInEmptyParentheses: false
-SpacesBeforeTrailingComments: 1
-SpacesInAngles:  Never
-SpacesInConditionalStatement: false
-SpacesInContainerLiterals: true
-SpacesInCStyleCastParentheses: false
-SpacesInLineCommentPrefix:
-  Minimum:         1
-  Maximum:         -1
-SpacesInParentheses: false
-SpacesInSquareBrackets: false
-SpaceBeforeSquareBrackets: false
-BitFieldColonSpacing: Both
-Standard:        Latest
-StatementAttributeLikeMacros:
-  - Q_EMIT
-StatementMacros:
-  - Q_UNUSED
-  - QT_REQUIRE_VERSION
-TabWidth:        8
-UseCRLF:         false
-UseTab:          Never
-WhitespaceSensitiveMacros:
-  - STRINGIZE
-  - PP_STRINGIZE
-  - BOOST_PP_STRINGIZE
-  - NS_SWIFT_NAME
-  - CF_SWIFT_NAME
-...
-

Makefile

@@ -1,7 +1,7 @@
 all: tikker run
 
-tikker: tikker.c sormc.h
+tikker: tikker.c
-	gcc tikker.c -Ofast -Wall -Werror -Wextra -o tikker -lsqlite3
+	gcc tikker.c -Ofast -Wall -Wextra -pedantic -o tikker -lsqlite3
 
 run:
 	./tikker

sormc.h

@@ -8549,6 +8549,7 @@ void sormd(int db);
 char *sormpt(char *sql, int number);
 unsigned int sormcq(char *sql, char *out);
 unsigned int sormpc(char *sql);
+sqlite3_stmt *sormb(sorm_t *db, char *sql, ...);
 sorm_ptr sormq(int db, char *sql, ...);
 char *sorm_csvc(int db, sqlite3_stmt *stmt);
 char *sorm_csvd(int db, sqlite3_stmt *stmt);
@@ -8570,14 +8571,18 @@ int sorm_instance_count = 0;
 
 int sormc(char *path) {
     // sorm connect
+    printf("HIERR\n");
     sorm_instance_count++;
     sorm_instance_count++;
     sorm_instances = realloc(sorm_instances, sorm_instance_count * sizeof(sorm_t *) + sorm_instance_count * sizeof(sorm_t));
 
-    sorm_t *db = (sorm_t *)&sorm_instances[sorm_instance_count - 1];
+    printf("HIERR\n");
+    sorm_t *db = &sorm_instances[sorm_instance_count - 1];
 
+    printf("HIERR\n");
     db->conn = NULL;
 
+    printf("HIERR\n");
     db->csv = NULL;
     db->current_column = 0;
     db->current_row = 0;
@@ -8592,9 +8597,10 @@ int sormc(char *path) {
         fprintf(stderr, "Can't open database: %s\n", sqlite3_errmsg(db->conn));
         return 0;
     }
+    printf("DONE!\n");
     return sorm_instance_count;
 }
-sorm_t *sormg(int ptr) { return (sorm_t *)&sorm_instances[ptr - 1]; }
+sorm_t *sormg(int ptr) { return &sorm_instances[ptr - 1]; }
 
 char *sormgcsv(int ptr) {
     /* sorm get csv*/
@@ -8705,10 +8711,9 @@ Execute 3.35s, Format: 36.77s
 Memory usage: 537 GB, 96.026 allocated, 96.024 freed, 2 in use.
 */
 char *sorm_csvc(int db, sqlite3_stmt *stmt) {
-    (void)db;
     sormstr_t *str = sormstrn(512);
     unsigned int column_count = sqlite3_column_count(stmt);
-    for (uint i = 0; i < column_count; i++) {
+    for (int i = 0; i < column_count; i++) {
         const char *column_name = sqlite3_column_name(stmt, i);
         sormstra(str, column_name);
         sormstra(str, "(");
@@ -8723,7 +8728,7 @@ char *sorm_csvc(int db, sqlite3_stmt *stmt) {
     return sormstrc(str);
 }
 char *sorm_csvd(int sorm, sqlite3_stmt *stmt) {
-    (void)sorm;
+    sorm_t *db = sormg(sorm);
     int rc = SQLITE_ROW;
     int column_count = sqlite3_column_count(stmt);
     /*
@@ -8750,7 +8755,7 @@ char *sorm_csvd(int sorm, sqlite3_stmt *stmt) {
                 sprintf(temp, "%f", sqlite3_column_double(stmt, field_index));
                 sormstra(str, temp);
             } else if (sqlite3_column_type(stmt, field_index) == SQLITE3_TEXT) {
-                const char *temp = ( char *)sqlite3_column_text(stmt, field_index);
+                const char *temp = sqlite3_column_text(stmt, field_index);
                 sormstra(str, temp);
             } else {
                 // exit(1);
@@ -8769,6 +8774,7 @@ char *sorm_csvd(int sorm, sqlite3_stmt *stmt) {
 }
 
 char *sorm_csv(int sorm, sqlite3_stmt *stmt) {
+    sorm_t *db = sormg(sorm);
     sorm_row_count = 0;
     char *column_names = sorm_csvc(sorm, stmt);
     char *data = sorm_csvd(sorm, stmt);
@@ -8783,16 +8789,31 @@ char *sorm_csv(int sorm, sqlite3_stmt *stmt) {
     return result;
 }
 
+sqlite3_stmt *sormb(sorm_t *db, char *sql, ...) {
+    // Bind parameters to statement and return amount of parameters
+    int rc = 0;
+    sqlite3_stmt *stmt;
+    va_list args;
+    va_start(args, sql);
+    unsigned int number = 0;
+    char *clean_query = (char *)malloc(strlen(sql) + 1);
+    unsigned int parameter_count = sormcq(sql, clean_query);
+    free(clean_query);
 
+    return stmt;
+}
 
 char *sormm(sorm_t *db) {
-    (void)db;
     /* sormmemory */
     return rmalloc_stats();
 }
 
 sorm_ptr sormq(int sorm, char *sql, ...) {
     sorm_t *db = sormg(sorm);
+    if (db->csv) {
+        // free(db->csv);
+        // db->csv = NULL;
+    }
     _sorm_query_start = nsecs();
     db->time_query_start = nsecs();
     va_list args;
@@ -8800,16 +8821,17 @@ sorm_ptr sormq(int sorm, char *sql, ...) {
     sqlite3_stmt *stmt;
     sorm_ptr result = NULL;
     char *clean_query = malloc(strlen(sql) + 1);
-    uint parameter_count = sormcq(sql, clean_query);
+    unsigned int parameter_count = sormcq(sql, clean_query);
     int rc = sqlite3_prepare_v2(db->conn, clean_query, -1, &stmt, 0);
     if (rc != SQLITE_OK) {
         fprintf(stderr, "%s\n", sqlite3_errmsg(db->conn));
     }
     free(clean_query);
     int number = 0;
-    for (uint i = 0; i < parameter_count; i++) {
+    for (int i = 0; i < parameter_count; i++) {
         number++;
         char *column_type = sormpt(sql, number);
+        int arg_index = number - 1;
         if (!strcmp(column_type, "int") || !strcmp(column_type, "integer") || !strcmp(column_type, "number")) {
             rc = sqlite3_bind_int(stmt, number, va_arg(args, int));
         } else if (!strcmp(column_type, "int64")) {
@@ -8823,7 +8845,7 @@ sorm_ptr sormq(int sorm, char *sql, ...) {
             rc = sqlite3_bind_blob(stmt, number, data, size, SQLITE_STATIC);
         } else if (!strcmp(column_type, "text") || !strcmp(column_type, "str") || !strcmp(column_type, "string")) {
             unsigned char *data = va_arg(args, unsigned char *);
-            rc = sqlite3_bind_text(stmt, number, (char *)data, -1, SQLITE_STATIC);
+            rc = sqlite3_bind_text(stmt, number, data, -1, SQLITE_STATIC);
         }
         if (rc != SQLITE_OK) {
             fprintf(stderr, "Failed to bind parameters: %s\n", sqlite3_errmsg(db->conn));
@@ -8882,7 +8904,7 @@ int sormlv(char *csv) {
     while (*csv) {
         char *found = strstr(csv, ";");
         if (found) {
-            if (found - csv > (long int)longest)
+            if (found - csv > longest)
                 longest = found - csv;
             csv = csv + (found - csv) + 1;
         } else {
@@ -8973,7 +8995,7 @@ char *sormfmt(char *csv) {
     sormstr_t *str = sormstrn(longest + 2);
     while (*csv && (field = sormcsvn(csv))) {
         sormstra(str, field);
-        for (size_t i = 0; i < longest - strlen(field); i++)
+        for (int i = 0; i < longest - strlen(field); i++)
             sormstra(str, " ");
 
         csv += strlen(field);
@@ -9027,5 +9049,3 @@ void sormfmtd(char *csv) {
 }
 
 #endif
-
-

tikker.c

@@ -22,7 +22,7 @@ int is_keyboard(int fd) {
 
 int main() {
 
-    int db = sormc("tikker.db");
+    db = sormc("tikker.db");
 
     ulonglong times_repeated = 0;
     ulonglong times_pressed = 0;