<pre style='margin:0'>
Umesh Singla (umeshksingla) pushed a commit to branch gsoc17-migrate
in repository macports-base.
</pre>
<p><a href="https://github.com/macports/macports-base/commit/30883910dbfdec92e2f5043749febf8d6874db25">https://github.com/macports/macports-base/commit/30883910dbfdec92e2f5043749febf8d6874db25</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 30883910dbfdec92e2f5043749febf8d6874db25
</span>Author: Umesh Singla <umeshksingla@macports.org>
AuthorDate: Sat Aug 12 23:17:15 2017 +0530
<span style='display:block; white-space:pre;color:#404040;'> Remove potential compiling errors and modularize snapshot
</span>---
src/cregistry/entry.c | 22 +++++++++++++++-------
src/cregistry/entry.h | 5 ++++-
src/cregistry/snapshot.c | 0
src/cregistry/snapshot.h | 0
src/registry2.0/snapshot.c | 0
src/registry2.0/snapshot.h | 0
src/registry2.0/snapshotobj.c | 0
src/registry2.0/snapshotobj.h | 0
src/registry2.0/util.c | 2 +-
9 files changed, 20 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/entry.c b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;color:#808080;'>index b818efe..76a66a9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/entry.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1586,15 +1586,18 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
</span> int result_space = 10;
int r;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* variant_name;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ const char* variant_sign;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> do {
r = sqlite3_step(stmt);
switch (r) {
case SQLITE_ROW:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- char* variant_name = (const char*)sqlite3_column_text(stmt, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* variant_sign = (const char*)sqlite3_column_text(stmt, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant_name = sqlite3_column_text(stmt, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant_sign = sqlite3_column_text(stmt, 3);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- variant element = malloc(10 * sizeof(variant));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant* element = malloc(10 * sizeof(variant));
</span>
if (!element) {
return -1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1613,6 +1616,7 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
</span> default:
reg_sqlite_error(reg->db, errPtr, query);
break;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> } while (r == SQLITE_ROW || r == SQLITE_BUSY);
sqlite3_finalize(stmt);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1622,7 +1626,8 @@ int reg_snapshot_port_variants_get(reg_registry* reg, sqlite_int64 snapshot_port
</span> } else {
int i;
for (i = 0; i < result_count; i++) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- free(result[i]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(result[i].variant_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(result[i].variant_sign);
</span> }
free(result);
return -1;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1661,14 +1666,17 @@ int reg_snapshot_get(reg_registry* reg, char* id, reg_snapshot* snapshot, reg_er
</span> int result_space = 10;
int r;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ sqlite_int64 snapshot_port_id;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int requested;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> do {
r = sqlite3_step(stmt);
switch (r) {
case SQLITE_ROW:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sqlite_int64 snapshot_port_id = sqlite3_column_int64(stmt, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ snapshot_port_id = sqlite3_column_int64(stmt, 0);
</span> port_name = (const char*) sqlite3_column_text(stmt, 2);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- int requested = (int) sqlite3_column_int64(stmt, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ requested = (int) sqlite3_column_int64(stmt, 3);
</span> state = (const char*) sqlite3_column_text(stmt, 4);
port* current_port;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1720,7 +1728,7 @@ int reg_snapshot_get(reg_registry* reg, char* id, reg_snapshot* snapshot, reg_er
</span> s->note = NULL;
s->proc = NULL;
s->ports = result;
<span style='display:block; white-space:pre;background:#ffe0e0;'>- *snapshot = s;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *snapshot = *s;
</span>
return result_count;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/entry.h b/src/cregistry/entry.h
</span><span style='display:block; white-space:pre;color:#808080;'>index 03e0617..6f20921 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/entry.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/entry.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -124,7 +124,10 @@ int get_parsed_variants(char* variants_str, variant* all_variants,
</span> char* delim, int* variant_count);
char* reg_snapshot_get_id(reg_registry* reg, reg_error* errPtr);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-reg_snapshot* reg_snapshot_get(reg_registry* reg, char* id, reg_error* errPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int reg_snapshot_port_variants_get(reg_registry* reg,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sqlite_int64 snapshot_port_id, variant** variants, reg_error* errPtr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+int reg_snapshot_get(reg_registry* reg, char* id,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reg_snapshot* snapshot, reg_error* errPtr);
</span>
int reg_all_open_entries(reg_registry* reg, reg_entry*** entries);
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/snapshot.c b/src/cregistry/snapshot.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/snapshot.h b/src/cregistry/snapshot.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/snapshot.c b/src/registry2.0/snapshot.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/snapshot.h b/src/registry2.0/snapshot.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/snapshotobj.c b/src/registry2.0/snapshotobj.c
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/snapshotobj.h b/src/registry2.0/snapshotobj.h
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..e69de29
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/registry2.0/util.c b/src/registry2.0/util.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 705d869..c77e285 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/registry2.0/util.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/registry2.0/util.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -333,7 +333,7 @@ int snapshot_to_obj(Tcl_Interp* interp, Tcl_Obj** obj, reg_snapshot* snapshot,
</span> if (!name) {
return 0;
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!set_snapshot(interp, name, entry, errPtr)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!set_snapshot(interp, name, snapshot, errPtr)) {
</span> free(name);
return 0;
}
</pre><pre style='margin:0'>
</pre>