Remove potential compiling errors and modularize snapshot

src/cregistry/entry.c

@@ -1586,15 +1586,18 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
         int result_space = 10;
         int r;
 
+        const char* variant_name;
+        const char* variant_sign;
+
         do {
             r = sqlite3_step(stmt);
             switch (r) {
                 case SQLITE_ROW:
 
-                    char* variant_name = (const char*)sqlite3_column_text(stmt, 2);
-                    char* variant_sign = (const char*)sqlite3_column_text(stmt, 3);
+                    variant_name = sqlite3_column_text(stmt, 2);
+                    variant_sign = sqlite3_column_text(stmt, 3);
 
-                    variant element = malloc(10 * sizeof(variant));
+                    variant* element = malloc(10 * sizeof(variant));
 
                     if (!element) {
                         return -1;
@@ -1613,6 +1616,7 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
                 default:
                     reg_sqlite_error(reg->db, errPtr, query);
                     break;
+            }
         } while (r == SQLITE_ROW || r == SQLITE_BUSY);
 
         sqlite3_finalize(stmt);
@@ -1622,7 +1626,8 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
         } else {
             int i;
             for (i = 0; i < result_count; i++) {
-                free(result[i]);
+                free(result[i].variant_name);
+                free(result[i].variant_sign);
             }
             free(result);
             return -1;
@@ -1661,14 +1666,17 @@ int reg_snapshot_get(reg_registry* reg, char* id, reg_snapshot* snapshot, reg_er
         int result_space = 10;
         int r;
 
+        sqlite_int64 snapshot_port_id;
+        int requested;
+
         do {
             r = sqlite3_step(stmt);
             switch (r) {
                 case SQLITE_ROW:
 
-                    sqlite_int64 snapshot_port_id = sqlite3_column_int64(stmt, 0);
+                    snapshot_port_id = sqlite3_column_int64(stmt, 0);
                     port_name = (const char*) sqlite3_column_text(stmt, 2);
-                    int requested = (int) sqlite3_column_int64(stmt, 3);
+                    requested = (int) sqlite3_column_int64(stmt, 3);
                     state = (const char*) sqlite3_column_text(stmt, 4);
 
                     port* current_port;
@@ -1720,7 +1728,7 @@ int reg_snapshot_get(reg_registry* reg, char* id, reg_snapshot* snapshot, reg_er
             s->note = NULL;
             s->proc = NULL;
             s->ports = result;
-            *snapshot = s;
+            *snapshot = *s;
 
             return result_count;
 

src/cregistry/entry.h

@@ -124,7 +124,10 @@ int get_parsed_variants(char* variants_str, variant* all_variants,
     char* delim, int* variant_count);
 
 char* reg_snapshot_get_id(reg_registry* reg, reg_error* errPtr);
-reg_snapshot* reg_snapshot_get(reg_registry* reg, char* id, reg_error* errPtr);
+int reg_snapshot_port_variants_get(reg_registry* reg,
+        sqlite_int64 snapshot_port_id, variant** variants, reg_error* errPtr);
+int reg_snapshot_get(reg_registry* reg, char* id,
+        reg_snapshot* snapshot, reg_error* errPtr);
 
 int reg_all_open_entries(reg_registry* reg, reg_entry*** entries);
 

src/registry2.0/util.c

@@ -333,7 +333,7 @@ int snapshot_to_obj(Tcl_Interp* interp, Tcl_Obj** obj, reg_snapshot* snapshot,
         if (!name) {
             return 0;
         }
-        if (!set_snapshot(interp, name, entry, errPtr)) {
+        if (!set_snapshot(interp, name, snapshot, errPtr)) {
             free(name);
             return 0;
         }