Skip to contentSkip to conversation

string_list: use the right kind of STRING_LIST_INIT

PATCH In review Junio C Hamano 3 participants 5 messages Jul 21, 2022 – Jul 25, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 string_list: use the right kind of STRING_LIST_INIT

Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, 2009-06-13), the string_list that was initialized with 0 in its strdup_string member is immediately made to strdup its key strings by flipping the strdup_string member to true. When 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically replaced the initialization to STRING_LIST_INIT_NODUP.

Instead, just use the other initialization macro to make it strdup the key from the beginning.

---
 builtin/remote.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
builtin/remote.c +1 -2
index d9b8746cb3..c713463d89 100644
@@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv)
 
 static int show_all(void)
 {
-	struct string_list list = STRING_LIST_INIT_NODUP;
+	struct string_list list = STRING_LIST_INIT_DUP;
 	int result;
 
-	list.strdup_strings = 1;
 	result = for_each_remote(get_one_entry, &list);
 
 	if (!result) {
#1 lore raw
Quoted 23 lines · Junio C Hamano

Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, 2009-06-13), the string_list that was initialized with 0 in its strdup_string member is immediately made to strdup its key strings by flipping the strdup_string member to true. When 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically replaced the initialization to STRING_LIST_INIT_NODUP.

Instead, just use the other initialization macro to make it strdup the key from the beginning.

---
 builtin/remote.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
builtin/remote.c +0 -0
index d9b8746cb3..c713463d89 100644
@@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv)
 

builtin/remote.c static int get_one_entry(struct remote *remote, void *priv) · line 1237

Quoted 10 lines
builtin/remote.c +1 -2
 static int show_all(void)
 {
-       struct string_list list = STRING_LIST_INIT_NODUP;
+       struct string_list list = STRING_LIST_INIT_DUP;
        int result;
 
-       list.strdup_strings = 1;
        result = for_each_remote(get_one_entry, &list);
 
        if (!result) {

Makes sense, but shouldn't the subject have s/string-list:/remote:/ ?

#2 lore raw
Quoted 1 line · Elijah Newren

Makes sense, but shouldn't the subject have s/string-list:/remote:/ ?

Oh, you are absolutely right.

I was influenced by 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04), which I was staring at too much while thinking that this fix was finishing up what it started.

Will amend. Thanks.

#3 lore raw
In reply to Junio C Hamano
Quoted 22 lines · Junio C Hamano

Since 4a4b4cda (builtin-remote: Make "remote -v" display push urls, 2009-06-13), the string_list that was initialized with 0 in its strdup_string member is immediately made to strdup its key strings by flipping the strdup_string member to true. When 183113a5 (string_list: Add STRING_LIST_INIT macro and make use of it., 2010-07-04) has introduced STRING_LIST_INIT macros, it mechanically replaced the initialization to STRING_LIST_INIT_NODUP.

Instead, just use the other initialization macro to make it strdup the key from the beginning.

---
 builtin/remote.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
builtin/remote.c +0 -0
index d9b8746cb3..c713463d89 100644
@@ -1229,10 +1229,9 @@ static int get_one_entry(struct remote *remote, void *priv)
 

builtin/remote.c static int get_one_entry(struct remote *remote, void *priv) · line 1237

Quoted 10 lines
builtin/remote.c +1 -2
 static int show_all(void)
 {
-	struct string_list list = STRING_LIST_INIT_NODUP;
+	struct string_list list = STRING_LIST_INIT_DUP;
 	int result;
 
-	list.strdup_strings = 1;
 	result = for_each_remote(get_one_entry, &list);
 
 	if (!result) {

Heh :) I think it's safe to give this my Reviewed-By, since I've been running with this patch for almost a year now:
https://github.com/avar/git/commit/bdf4466eb92

It's on a branch of some WIP string_list API fixes that I haven't sent in, but the fix looks good to me...

#4 lore raw
Quoted 6 lines · Ævar Arnfjörð Bjarmason

Heh :) I think it's safe to give this my Reviewed-By, since I've been running with this patch for almost a year now:
https://github.com/avar/git/commit/bdf4466eb92

It's on a branch of some WIP string_list API fixes that I haven't sent in, but the fix looks good to me...

I do not think it is all that urgent, but I do not think it is worth wasting our braincells to remember that a WIP series is waiting to touch and update this area again, so I'll merge this single patch down to 'next' and 'master' soonish.

Thanks.