<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/1093256fb31097f2472aef5b7fbf4e3a217776b5">https://github.com/macports/macports-base/commit/1093256fb31097f2472aef5b7fbf4e3a217776b5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1093256fb31097f2472aef5b7fbf4e3a217776b5
</span>Author: Umesh Singla <umeshksingla@macports.org>
AuthorDate: Tue Jul 11 01:34:42 2017 +0530
<span style='display:block; white-space:pre;color:#404040;'> minor changes
</span>---
src/cregistry/entry.c | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 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 09dc2d1..2b49a0a 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;'>@@ -1396,7 +1396,7 @@ int snapshot_store_ports(reg_registry* reg, reg_entry* snap_entry, reg_error* er
</span> break;
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("done with *%s* port\n\n", port_name);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("\ndone with *%s* port\n\n", port_name);
</span> break;
case SQLITE_BUSY:
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1416,7 +1416,6 @@ int snapshot_store_ports(reg_registry* reg, reg_entry* snap_entry, reg_error* er
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("stored: %d\n", result);
</span> return result;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1451,7 +1450,7 @@ int snapshot_store_port_variants(reg_registry* reg, reg_entry* port_entry,
</span> get_parsed_variants(positive_variants_str, all_variants, pos_delim, &variant_count);
get_parsed_variants(negative_variants_str, all_variants, neg_delim, &variant_count);
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("total var count: %d\n", variant_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("total var count: %d, ", variant_count);
</span>
for ( i = 0; i < variant_count; i++){
sqlite3_stmt* stmt = NULL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1468,7 +1467,7 @@ int snapshot_store_port_variants(reg_registry* reg, reg_entry* port_entry,
</span> r = sqlite3_step(stmt);
switch (r) {
case SQLITE_DONE:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("variant stored: %s with sign: %s\n",
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("\nvariant stored: %s with sign: %s",
</span> v.variant_name, v.variant_sign);
result = 1;
break;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1492,39 +1491,24 @@ int snapshot_store_port_variants(reg_registry* reg, reg_entry* port_entry,
</span>
void get_parsed_variants(char* variants_str, variant* all_variants, char* delim, int* variant_count) {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("var count yet%d\n", *variant_count);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ printf("var count yet %d, ", *variant_count);
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- /*char *token;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *token;
</span> char *rest = variants_str;
while ((token = strtok_r(rest, delim, &rest))) {
printf("%s\n", token);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- variant v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v.variant_name = token;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- v.variant_sign = delim;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all_variants[*variant_count] = v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *variant_count = *variant_count + 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }*/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *token = strtok(variants_str, delim);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (token != NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- printf("%s\n", token);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant v;
v.variant_name = token;
v.variant_sign = delim;
all_variants[*variant_count] = v;
*variant_count = *variant_count + 1;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- token = strtok(NULL, delim);
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return ;
</span> }
/**
</pre><pre style='margin:0'>
</pre>