Added more explicit string_dup functions

Author: marcobambini

src/cloudsync.c

@@ -601,7 +601,7 @@ cloudsync_table_context *table_create (cloudsync_context *data, const char *name
 
     table->context = data;
     table->algo = algo;
-    table->name = cloudsync_string_dup(name, true);
+    table->name = cloudsync_string_dup_lowercase(name);
     if (!table->name) {
         cloudsync_memory_free(table);
         return NULL;
@@ -869,7 +869,7 @@ int table_add_to_context_cb (void *xdata, int ncols, char **values, char **names
         int cid = (int)strtol(values[i+1], NULL, 0);
 
         table->col_id[index] = cid;
-        table->col_name[index] = cloudsync_string_dup(name, true);
+        table->col_name[index] = cloudsync_string_dup_lowercase(name);
         if (!table->col_name[index]) return 1;
 
         char *sql = table_build_mergeinsert_sql(db, table, name);

src/postgresql/database_postgresql.c

@@ -614,7 +614,7 @@ static int set_last_error(int errcode, const char *errmsg) {
     }
 
     if (errmsg) {
-        last_error_msg = pstrdup(errmsg);
+        last_error_msg = cloudsync_string_dup(errmsg);
     }
 
     return errcode;
@@ -1091,7 +1091,7 @@ int database_pk_names (db_t *db, const char *table_name, char ***names, int *cou
         if (!isnull) {
             text *txt = DatumGetTextP(datum);
             char *name = text_to_cstring(txt);
-            pk_names[i] = cloudsync_string_dup(name, false);
+            pk_names[i] = cloudsync_string_dup(name);
         } else {
             pk_names[i] = NULL;
         }
@@ -1366,7 +1366,7 @@ void *database_value_dup (dbvalue_t *value) {
         copy->detoasted = true;
     }
     if (v->cstring) {
-        copy->cstring = pstrdup(v->cstring);
+        copy->cstring = cloudsync_string_dup(v->cstring);
         copy->owns_cstring = true;
     }
     return (void*)copy;

src/sqlite/database_sqlite.c

@@ -742,7 +742,7 @@ int database_pk_rowid (db_t *db, const char *table_name, char ***names, int *cou
     if (rc == SQLITE_OK) {
         char **r = (char**)cloudsync_memory_alloc(sizeof(char*));
         if (!r) return SQLITE_NOMEM;
-        r[0] = cloudsync_string_dup("rowid", false);
+        r[0] = cloudsync_string_dup("rowid");
         *names = r;
         *count = 1;
     } else {
@@ -789,7 +789,7 @@ int database_pk_names (db_t *db, const char *table_name, char ***names, int *cou
     while ((rc = sqlite3_step(vm)) == SQLITE_ROW) {
         const char *txt = (const char*)sqlite3_column_text(vm, 0);
         if (!txt) {rc = SQLITE_ERROR; goto cleanup;}
-        r[i] = cloudsync_string_dup(txt, false);
+        r[i] = cloudsync_string_dup(txt);
         if (!r[i]) { rc = SQLITE_NOMEM; goto cleanup;}
         i++;
     }

src/utils.c

@@ -127,7 +127,7 @@ int cloudsync_uuid_v7_compare (uint8_t value1[UUID_LEN], uint8_t value2[UUID_LEN
 
 // MARK: - General -
 
-char *cloudsync_string_ndup (const char *str, size_t len, bool lowercase) {
+char *cloudsync_string_ndup_v2 (const char *str, size_t len, bool lowercase) {
     if (str == NULL) return NULL;
 
     char *s = (char *)cloudsync_memory_alloc((uint64_t)(len + 1));
@@ -148,11 +148,20 @@ char *cloudsync_string_ndup (const char *str, size_t len, bool lowercase) {
     return s;
 }
 
-char *cloudsync_string_dup (const char *str, bool lowercase) {
-    if (str == NULL) return NULL;
-    
-    size_t len = strlen(str);
-    return cloudsync_string_ndup(str, len, lowercase);
+char *cloudsync_string_ndup (const char *str, size_t len) {
+    return cloudsync_string_ndup_v2(str, len, false);
+}
+
+char *cloudsync_string_ndup_lowercase (const char *str, size_t len) {
+    return cloudsync_string_ndup_v2(str, len, true);
+}
+
+char *cloudsync_string_dup (const char *str) {
+    return cloudsync_string_ndup_v2(str, (str) ? strlen(str) : 0, false);
+}
+
+char *cloudsync_string_dup_lowercase (const char *str) {
+    return cloudsync_string_ndup_v2(str, (str) ? strlen(str) : 0, true);
 }
 
 int cloudsync_blob_compare(const char *blob1, size_t size1, const char *blob2, size_t size2) {

src/utils.h

@@ -136,8 +136,11 @@ char *cloudsync_uuid_v7_stringify (uint8_t uuid[UUID_LEN], char value[UUID_STR_M
 uint64_t fnv1a_hash(const char *data, size_t len);
 
 char *cloudsync_string_replace_prefix(const char *input, char *prefix, char *replacement);
-char *cloudsync_string_ndup (const char *str, size_t len, bool lowercase);
-char *cloudsync_string_dup (const char *str, bool lowercase);
+char *cloudsync_string_dup (const char *str);
+char *cloudsync_string_dup_lowercase (const char *str);
+char *cloudsync_string_ndup (const char *str, size_t len);
+char *cloudsync_string_ndup_lowercase (const char *str, size_t len);
+
 int cloudsync_blob_compare(const char *blob1, size_t size1, const char *blob2, size_t size2);
 
 void cloudsync_rowid_decode (int64_t rowid, int64_t *db_version, int64_t *seq);

test/unit.c

@@ -178,7 +178,7 @@ DATABASE_RESULT dbutils_exec (sqlite3_context *context, sqlite3 *db, const char
                 }
             } else {
                 const char *value = database_column_text(pstmt, i);
-                if (value) buffer = cloudsync_string_dup((const char *)value, false);
+                if (value) buffer = cloudsync_string_dup((const char *)value);
             }
             results[i].value.stringValue = buffer;
         }
@@ -508,7 +508,7 @@ bool unittest_payload_apply_rls_callback(void **xdata, cloudsync_pk_decode_bind_
                 (strlen(s->last_tbl) != (size_t)tbl_len) ||
                 strncmp(s->last_tbl, tbl, (size_t)tbl_len) != 0) {
                 if (s->last_tbl) cloudsync_memory_free(s->last_tbl);
-                if (tbl && tbl_len > 0) s->last_tbl = cloudsync_string_ndup(tbl, tbl_len, false);
+                if (tbl && tbl_len > 0) s->last_tbl = cloudsync_string_ndup(tbl, tbl_len);
                 else s->last_tbl = NULL;
             }