<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/f45c2c68fd76dfd1e05b92300ac9cec7eacba2d2">https://github.com/macports/macports-base/commit/f45c2c68fd76dfd1e05b92300ac9cec7eacba2d2</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f45c2c68fd76dfd1e05b92300ac9cec7eacba2d2
</span>Author: Clemens Lang <cal@macports.org>
AuthorDate: Tue Oct 31 11:08:37 2023 +0100
<span style='display:block; white-space:pre;color:#404040;'> cregistry: Remove dead code
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> struct variant was only used in this code, which was never called
</span><span style='display:block; white-space:pre;color:#404040;'> anywhere.
</span>---
src/cregistry/snapshot.c | 26 --------------------------
src/cregistry/snapshot.h | 8 --------
2 files changed, 34 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 1715d95e2..e32792ef2 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;'>@@ -41,32 +41,6 @@
</span> #include <stdlib.h>
#include <string.h>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-/**
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * helper to parse variants into 'struct variant' form
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [in] variants_str the string to parse the variants from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [in] delim delimiter '+' for +ve variants, else '-'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [out] all_variants list of 'struct variant's
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @param [out] variant_count count of variants parsed till now
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * @return false
</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;'>-int get_parsed_variants(char* variants_str, variant* all_variants,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* delim, int* variant_count) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *token;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *rest = variants_str;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while ((token = strtok_r(rest, delim, &rest))) {
</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;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> /**
* Converts a `sqlite3_stmt` into a `reg_snapshot`. The first column of the stmt's
* row must be the id of an snapshot; the second either `SQLITE_NULL` or the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/src/cregistry/snapshot.h b/src/cregistry/snapshot.h
</span><span style='display:block; white-space:pre;color:#808080;'>index d1692659d..9f75eb2dc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/src/cregistry/snapshot.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/src/cregistry/snapshot.h
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,11 +40,6 @@
</span>
// TODO: extend it to support requested variants
<span style='display:block; white-space:pre;background:#ffe0e0;'>-typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* variant_name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* variant_sign;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} variant;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> typedef struct {
char* name; /* port name */
int requested; /* 1 if port os requested, else 0 */
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,9 +56,6 @@ typedef struct {
</span> char* proc; /* name of Tcl proc, if using Tcl */
} reg_snapshot;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-// helper to parse variants into 'struct variant' form
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-int get_parsed_variants(char* variants_str, variant* all_variants,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char* delim, int* variant_count);
</span> // get snapshot using id
reg_snapshot* reg_snapshot_open(reg_registry* reg, sqlite_int64 id,
reg_error* errPtr);
</pre><pre style='margin:0'>
</pre>