Minor refactor

Author: marcobambini

src/cloudsync.c

@@ -3156,6 +3156,15 @@ APIEXPORT int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite
     rc = dbutils_register_function(db, "cloudsync_network_decode", cloudsync_network_decode, -1, pzErrMsg, ctx, NULL);
     if (rc != SQLITE_OK) return rc;
 
+    rc = dbutils_register_function(db, "cloudsync_begin_alter", cloudsync_begin_alter, 1, pzErrMsg, ctx, NULL);
+    if (rc != SQLITE_OK) return rc;
+    
+    rc = dbutils_register_function(db, "cloudsync_commit_alter", cloudsync_commit_alter, 1, pzErrMsg, ctx, NULL);
+    if (rc != SQLITE_OK) return rc;
+    
+    rc = dbutils_register_function(db, "cloudsync_uuid", cloudsync_uuid, 0, pzErrMsg, ctx, NULL);
+    if (rc != SQLITE_OK) return rc;
+    
     // PRIVATE functions
     rc = dbutils_register_function(db, "cloudsync_is_sync", cloudsync_is_sync, 1, pzErrMsg, ctx, NULL);
     if (rc != SQLITE_OK) return rc;
@@ -3181,15 +3190,6 @@ APIEXPORT int sqlite3_cloudsync_init (sqlite3 *db, char **pzErrMsg, const sqlite
     rc = dbutils_register_function(db, "cloudsync_seq", cloudsync_seq, 0, pzErrMsg, ctx, NULL);
     if (rc != SQLITE_OK) return rc;
 
-    rc = dbutils_register_function(db, "cloudsync_begin_alter", cloudsync_begin_alter, 1, pzErrMsg, ctx, NULL);
-    if (rc != SQLITE_OK) return rc;
-    
-    rc = dbutils_register_function(db, "cloudsync_commit_alter", cloudsync_commit_alter, 1, pzErrMsg, ctx, NULL);
-    if (rc != SQLITE_OK) return rc;
-    
-    rc = dbutils_register_function(db, "cloudsync_uuid", cloudsync_uuid, 0, pzErrMsg, ctx, NULL);
-    if (rc != SQLITE_OK) return rc;
-    
     // NETWORK LAYER
     #ifndef CLOUDSYNC_OMIT_NETWORK
     rc = cloudsync_network_register(db, pzErrMsg, ctx);

src/network.c

@@ -54,6 +54,12 @@ typedef struct {
     size_t      blen;       // blen if code is SQLITE_OK, rc in case of error
 } NETWORK_RESULT;
 
+typedef struct {
+    const char *data;
+    size_t size;
+    size_t read_pos;
+} network_read_data;
+
 // MARK: -
 
 static bool network_buffer_check (network_buffer *data, size_t needed) {
@@ -155,12 +161,6 @@ static NETWORK_RESULT network_receive_buffer (network_data *data, const char *en
     return result;
 }
 
-typedef struct {
-    const char *data;
-    size_t size;
-    size_t read_pos;
-} network_read_data;
-
 static size_t network_read_callback(char *buffer, size_t size, size_t nitems, void *userdata) {
     network_read_data *rd = (network_read_data *)userdata;
     size_t max_read = size * nitems;
@@ -292,7 +292,7 @@ char *network_authentication_token(const char *key, const char *value) {
     return buffer;
 }
 
-int extract_query_param(const char *query, const char *key, char *output, size_t output_size) {
+int network_extract_query_param(const char *query, const char *key, char *output, size_t output_size) {
     if (!query || !key || !output || output_size == 0) {
         return -1; // Invalid input
     }
@@ -380,10 +380,10 @@ bool network_compute_endpoints (sqlite3_context *context, network_data *data, co
     if (rc != CURLE_OK && rc != CURLUE_NO_QUERY) goto finalize;
     if (query != NULL) {
         char value[MAX_QUERY_VALUE_LEN];
-        if (!authentication && extract_query_param(query, "apikey", value, sizeof(value)) == 0) {
+        if (!authentication && network_extract_query_param(query, "apikey", value, sizeof(value)) == 0) {
             authentication = network_authentication_token("apikey", value);
         }
-        if (!authentication && extract_query_param(query, "token", value, sizeof(value)) == 0) {
+        if (!authentication && network_extract_query_param(query, "token", value, sizeof(value)) == 0) {
             authentication = network_authentication_token("token", value);
         }
     }
@@ -428,6 +428,12 @@ bool network_compute_endpoints (sqlite3_context *context, network_data *data, co
     return result;
 }
 
+void network_result_to_sqlite_error (sqlite3_context *context, NETWORK_RESULT res, const char *default_error_message) {
+    sqlite3_result_error(context, ((res.code == CLOUDSYNC_NETWORK_ERROR) && (res.buffer)) ? res.buffer : default_error_message, -1);
+    sqlite3_result_error_code(context, ((res.code == CLOUDSYNC_NETWORK_ERROR) && (res.blen)) ? (int)res.blen : SQLITE_ERROR);
+    if (res.buffer) cloudsync_memory_free(res.buffer);
+}
+
 // MARK: -
 
 void cloudsync_network_init (sqlite3_context *context, int argc, sqlite3_value **argv) {
@@ -532,12 +538,6 @@ void cloudsync_network_set_apikey (sqlite3_context *context, int argc, sqlite3_v
 
 // MARK: -
 
-void network_result_to_sqlite_error (sqlite3_context *context, NETWORK_RESULT res, const char *default_error_message) {
-    sqlite3_result_error(context, ((res.code == CLOUDSYNC_NETWORK_ERROR) && (res.buffer)) ? res.buffer : default_error_message, -1);
-    sqlite3_result_error_code(context, ((res.code == CLOUDSYNC_NETWORK_ERROR) && (res.blen)) ? (int)res.blen : SQLITE_ERROR);
-    if (res.buffer) cloudsync_memory_free(res.buffer);
-}
-
 void cloudsync_network_send_changes (sqlite3_context *context, int argc, sqlite3_value **argv) {
     DEBUG_FUNCTION("cloudsync_network_send_changes");