<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-base.

</pre>
<p><a href="https://github.com/macports/macports-base/commit/708a59a7181ee294e486580fce719afd38117e2c">https://github.com/macports/macports-base/commit/708a59a7181ee294e486580fce719afd38117e2c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new 708a59a71 reg_snapshot_ports_get: only select needed columns
</span>708a59a71 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 708a59a7181ee294e486580fce719afd38117e2c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Jun 11 01:57:08 2024 +1000

<span style='display:block; white-space:pre;color:#404040;'>    reg_snapshot_ports_get: only select needed columns
</span>---
 src/cregistry/snapshot.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/snapshot.c b/src/cregistry/snapshot.c
</span><span style='display:block; white-space:pre;color:#808080;'>index 0b3c7bd9e..fb317378b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/snapshot.c
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/snapshot.c
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -311,12 +311,8 @@ int reg_snapshot_ports_get(reg_snapshot* snapshot, port*** ports, reg_error* err
</span>     reg_registry* reg = snapshot->reg;
     sqlite3_stmt* stmt = NULL;
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    char* query = "SELECT * FROM registry.snapshot_ports WHERE snapshots_id=?";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    const char* port_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    const char* state;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    const char* variants;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    const char* requested_variants;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    char* query = "SELECT port_name, requested, state, variants, requested_variants "
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                  "FROM registry.snapshot_ports WHERE snapshots_id=?";
</span> 
     if ((sqlite3_prepare_v2(reg->db, query, -1, &stmt, NULL) == SQLITE_OK)
         && (sqlite3_bind_int64(stmt, 1, snapshot->id) == SQLITE_OK )) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -331,18 +327,22 @@ int reg_snapshot_ports_get(reg_snapshot* snapshot, port*** ports, reg_error* err
</span>         int result_count = 0;
         int r;
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        const char* port_name;
</span>         int requested;
<span style='display:block; white-space:pre;background:#e0ffe0;'>+        const char* state;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        const char* variants;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        const char* requested_variants;
</span> 
         do {
             r = sqlite3_step(stmt);
             switch (r) {
                 case SQLITE_ROW:
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-                    port_name = (const char*) sqlite3_column_text(stmt, 2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    requested = (int) sqlite3_column_int64(stmt, 3);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    state = (const char*) sqlite3_column_text(stmt, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    variants = (const char*) sqlite3_column_text(stmt, 5);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    requested_variants = (const char*) sqlite3_column_text(stmt, 6);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    port_name = (const char*) sqlite3_column_text(stmt, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    requested = (int) sqlite3_column_int64(stmt, 1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    state = (const char*) sqlite3_column_text(stmt, 2);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    variants = (const char*) sqlite3_column_text(stmt, 3);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    requested_variants = (const char*) sqlite3_column_text(stmt, 4);
</span> 
                     port* current_port = (port*) malloc(sizeof(port));
                     if (!current_port) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,6 +363,7 @@ int reg_snapshot_ports_get(reg_snapshot* snapshot, port*** ports, reg_error* err
</span>                         free(current_port->state);
                         free(current_port->variants);
                         free(current_port->requested_variants);
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                        free(current_port);
</span>                         r = SQLITE_ERROR;
                         break;
                     }
</pre><pre style='margin:0'>

</pre>