Minor changes

Author: marcobambini

src/cloudsync.h

@@ -55,6 +55,7 @@ void cloudsync_rollback_hook (void *ctx);
 
 // PAYLOAD
 
+// available only on Desktop OS (no WASM, no mobile)
 //#ifdef CLOUDSYNC_DESKTOP_OS
 int cloudsync_payload_save (cloudsync_context *data, const char *payload_path, int *blob_size);
 //#endif
@@ -67,6 +68,8 @@ int    cloudsync_payload_encode_final (cloudsync_payload_context *payload, cloud
 char  *cloudsync_payload_blob (cloudsync_payload_context *payload, db_int64 *blob_size, db_int64 *nrows);
 size_t cloudsync_payload_context_size (size_t *header_size);
 
+
+
 // END OK
 
 // CLOUDSYNCTABLE CONTEXT

src/cloudsync_private.h

@@ -11,12 +11,6 @@
 #include <stdbool.h>
 #include "cloudsync.h"
 
-#ifndef SQLITE_CORE
-#include "sqlite3ext.h"
-#else
-#include "sqlite3.h"
-#endif
-
 #define CLOUDSYNC_VALUE_NOTSET                  -1
 #define CLOUDSYNC_TOMBSTONE_VALUE               "__[RIP]__"
 #define CLOUDSYNC_RLS_RESTRICTED_VALUE          "__[RLS]__"

src/dbutils.c

@@ -33,6 +33,7 @@ typedef struct {
 } DATABASE_RESULT;
 
 int dbutils_settings_check_version (sqlite3 *db, const char *version);
+bool table_add_to_context (db_t *db, cloudsync_context *data, table_algo algo, const char *table_name);
 
 // MARK: - General -
 
@@ -49,7 +50,6 @@ DATABASE_RESULT dbutils_exec (sqlite3_context *context, sqlite3 *db, const char
     // compile sql
     int rc = database_prepare(db, sql, (void **)&pstmt, 0);
     if (rc != SQLITE_OK) goto dbutils_exec_finalize;
-    
     // check bindings
     for (int i=0; i<count; ++i) {
         switch (types[i]) {
@@ -671,10 +671,8 @@ sqlite3_int64 dbutils_schema_version (sqlite3 *db) {
 
 // MARK: - Settings -
 
-int binary_comparison (int x, int y) {
-    if (x == y) return 0;
-    if (x > y) return 1;
-    return -1;
+int dbutils_binary_comparison (int x, int y) {
+    return (x == y) ? 0 : (x > y ? 1 : -1);
 }
 
 char *dbutils_settings_get_value (sqlite3 *db, const char *key, char *buffer, size_t blen) {
@@ -777,9 +775,9 @@ int dbutils_settings_check_version (sqlite3 *db, const char *version) {
     if (count1 != 3 || count2 != 3) return -666;
 
     int res = 0;
-    if ((res = binary_comparison(major1, major2)) == 0) {
-        if ((res = binary_comparison(minor1, minor2)) == 0) {
-            return binary_comparison(patch1, patch2);
+    if ((res = dbutils_binary_comparison(major1, major2)) == 0) {
+        if ((res = dbutils_binary_comparison(minor1, minor2)) == 0) {
+            return dbutils_binary_comparison(patch1, patch2);
         }
     }
 
@@ -920,8 +918,6 @@ int dbutils_settings_load_callback (void *xdata, int ncols, char **values, char
     return 0;
 }
 
-bool table_add_to_context (sqlite3 *db, cloudsync_context *data, table_algo algo, const char *table_name);
-
 int dbutils_settings_table_load_callback (void *xdata, int ncols, char **values, char **names) {
     cloudsync_context *data = (cloudsync_context *)xdata;
     sqlite3 *db = cloudsync_db(data);
@@ -1049,9 +1045,6 @@ int dbutils_settings_init (sqlite3 *db, void *cloudsync_data, sqlite3_context *c
      */
 
     return SQLITE_OK;
-    
-abort:
-    return rc;
 }
 
 int dbutils_update_schema_hash(sqlite3 *db, uint64_t *hash) {

src/dbutils.h

@@ -12,6 +12,12 @@
 #include "utils.h"
 #include "cloudsync_private.h"
 
+#ifndef SQLITE_CORE
+#include "sqlite3ext.h"
+#else
+#include "sqlite3.h"
+#endif
+
 #define CLOUDSYNC_SETTINGS_NAME             "cloudsync_settings"
 #define CLOUDSYNC_SITEID_NAME               "cloudsync_site_id"
 #define CLOUDSYNC_TABLE_SETTINGS_NAME       "cloudsync_table_settings"

src/utils.c

@@ -109,15 +109,17 @@ char *cloudsync_uuid_v7_stringify (uint8_t uuid[UUID_LEN], char value[UUID_STR_M
 
 char *cloudsync_uuid_v7_string (char value[UUID_STR_MAXLEN], bool dash_format) {
     uint8_t uuid[UUID_LEN];
-    if (cloudsync_uuid_v7(uuid) != 0) return NULL;
 
+    if (cloudsync_uuid_v7(uuid) != 0) return NULL;
     return cloudsync_uuid_v7_stringify(uuid, value, dash_format);
 }
 
 int cloudsync_uuid_v7_compare (uint8_t value1[UUID_LEN], uint8_t value2[UUID_LEN]) {
     // reconstruct the timestamp by reversing the bit shifts and combining the bytes
-    uint64_t t1 = ((uint64_t)value1[0] << 40) | ((uint64_t)value1[1] << 32) | ((uint64_t)value1[2] << 24) | ((uint64_t)value1[3] << 16) | ((uint64_t)value1[4] << 8)  | ((uint64_t)value1[5]);
-    uint64_t t2 = ((uint64_t)value2[0] << 40) | ((uint64_t)value2[1] << 32) | ((uint64_t)value2[2] << 24) | ((uint64_t)value2[3] << 16) | ((uint64_t)value2[4] << 8)  | ((uint64_t)value2[5]);
+    uint64_t t1 =   ((uint64_t)value1[0] << 40) | ((uint64_t)value1[1] << 32) | ((uint64_t)value1[2] << 24) |
+                    ((uint64_t)value1[3] << 16) | ((uint64_t)value1[4] << 8)  | ((uint64_t)value1[5]);
+    uint64_t t2 =   ((uint64_t)value2[0] << 40) | ((uint64_t)value2[1] << 32) | ((uint64_t)value2[2] << 24) |
+                    ((uint64_t)value2[3] << 16) | ((uint64_t)value2[4] << 8)  | ((uint64_t)value2[5]);
 
     if (t1 == t2) return memcmp(value1, value2, UUID_LEN);
     return (t1 > t2) ? 1 : -1;
@@ -154,10 +156,8 @@ char *cloudsync_string_dup (const char *str, bool lowercase) {
 }
 
 int cloudsync_blob_compare(const char *blob1, size_t size1, const char *blob2, size_t size2) {
-    if (size1 != size2) {
-        return (int)(size1 - size2); // Blobs are different if sizes are different
-    }
-    return memcmp(blob1, blob2, size1); // Use memcmp for byte-by-byte comparison
+    if (size1 != size2) return (int)(size1 - size2); // blobs are different if sizes are different
+    return memcmp(blob1, blob2, size1); // use memcmp for byte-by-byte comparison
 }
 
 void cloudsync_rowid_decode (db_int64 rowid, db_int64 *db_version, db_int64 *seq) {
@@ -184,13 +184,13 @@ char *cloudsync_string_replace_prefix(const char *input, char *prefix, char *rep
     size_t replacement_len = strlen(replacement);
 
     if (strncmp(input, prefix, prefix_len) == 0) {
-        // Allocate memory for new string
+        // allocate memory for new string
         size_t input_len = strlen(input);
         size_t new_len = input_len - prefix_len + replacement_len;
         char *result = cloudsync_memory_alloc(new_len + 1); // +1 for null terminator
         if (!result) return NULL;
 
-        // Copy replacement and the rest of the input string
+        // copy replacement and the rest of the input string
         strcpy(result, replacement);
         strcpy(result + replacement_len, input + prefix_len);
         return result;
@@ -201,7 +201,7 @@ char *cloudsync_string_replace_prefix(const char *input, char *prefix, char *rep
 }
 
 /*
- Compute a normalized hash of a SQLite CREATE TABLE statement.
+ Compute a normalized hash of a CREATE TABLE statement.
  
  * Normalization:
   * - Skips comments (-- and / * )

src/utils.h

@@ -29,12 +29,6 @@
     #define CLOUDSYNC_DESKTOP_OS 1
 #endif
 
-#ifndef SQLITE_CORE
-#include "sqlite3ext.h"
-#else
-#include "sqlite3.h"
-#endif
-
 #define CLOUDSYNC_DEBUG_FUNCTIONS           0
 #define CLOUDSYNC_DEBUG_DBFUNCTIONS         0
 #define CLOUDSYNC_DEBUG_SETTINGS            0
@@ -150,7 +144,7 @@ int cloudsync_blob_compare(const char *blob1, size_t size1, const char *blob2, s
 
 void cloudsync_rowid_decode (db_int64 rowid, db_int64 *db_version, db_int64 *seq);
 
-// available only on Desktop OS
+// available only on Desktop OS (no WASM, no mobile)
 #ifdef CLOUDSYNC_DESKTOP_OS
 bool cloudsync_file_delete (const char *path);
 char *cloudsync_file_read (const char *path, db_int64 *len);

test/unit.c

@@ -42,7 +42,7 @@ int dbutils_settings_check_version (sqlite3 *db, const char *version);
 bool dbutils_migrate (sqlite3 *db);
 const char *vtab_opname_from_value (int value);
 int vtab_colname_is_legal (const char *name);
-int binary_comparison (int x, int y);
+int dbutils_binary_comparison (int x, int y);
 sqlite3 *do_create_database (void);
 
 static int stdout_backup = -1; // Backup file descriptor for stdout
@@ -1918,11 +1918,11 @@ bool do_test_dbutils (void) {
 
     int n1 = 1;
     int n2 = 2;
-    cmp = binary_comparison(n1, n2);
+    cmp = dbutils_binary_comparison(n1, n2);
     if (cmp != -1) goto finalize;
-    cmp = binary_comparison(n2, n1);
+    cmp = dbutils_binary_comparison(n2, n1);
     if (cmp != 1) goto finalize;
-    cmp = binary_comparison(n1, n1);
+    cmp = dbutils_binary_comparison(n1, n1);
     if (cmp != 0) goto finalize;
 
     rc = SQLITE_OK;