[PATCH 1/2] [Outreachy] gpg-interface: replace strbuf_split with string_list_split
- From
Olamide Caleb Bello <belkid98@gmail.com>
- Date
- Oct 15, 2025, 02:19 UTC
- Message-ID
- <aea3b80a8883c4dac4e05defdee3eb82b83fe8c9.1760490943.git.belkid98@gmail.com>
- In-Reply-To
- <cover.1760490943.git.belkid98@gmail.com>
get_ssh_finger_print() accepts a signing key and then uses pipe_command to execute the ssh-keygen command, gets its output and sets it in fingerprint_stdout.
The string in fingerprint_stdout is then split into 3 strbufs using strbuf_split_max(), however they are not modified after the split thereby not making use of the strbuf API as the fingerprint token is merely returned, hence they do not need to be strbufs.
Use string_list_split instead for simplicity.
Note that strbuf_split_max uses 3 to specify the number of tokens to extract from the string, while string_list_split uses 2 because it specifies the number of times the split will be done on the string, so 2 gives 3 tokens as it is in the initial instance.
Signed-off-by: Olamide Caleb Bello <belkid98@gmail.com> --- gpg-interface.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/gpg-interface.c b/gpg-interface.c index 2f4f0e32cb..043a808577 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -14,6 +14,7 @@ #include "sigchain.h" #include "tempfile.h" #include "alias.h" +#include "string-list.h" static int git_gpg_config(const char *, const char *, const struct config_context *, void *); @@ -821,7 +822,7 @@ static char *get_ssh_key_fingerprint(const char *signing_key) struct child_process ssh_keygen = CHILD_PROCESS_INIT; int ret = -1; struct strbuf fingerprint_stdout = STRBUF_INIT; - struct strbuf **fingerprint; + struct string_list split = STRING_LIST_INIT_DUP; char *fingerprint_ret; const char *literal_key = NULL; @@ -845,13 +846,12 @@ static char *get_ssh_key_fingerprint(const char *signing_key) die_errno(_("failed to get the ssh fingerprint for key '%s'"), signing_key); - fingerprint = strbuf_split_max(&fingerprint_stdout, ' ', 3); - if (!fingerprint[1]) + if (string_list_split(&split, fingerprint_stdout.buf, " ", 2) <= 1) die_errno(_("failed to get the ssh fingerprint for key '%s'"), signing_key); - fingerprint_ret = strbuf_detach(fingerprint[1], NULL); - strbuf_list_free(fingerprint); + fingerprint_ret = xstrdup(split.items[1].string); + string_list_clear(&split, 0); strbuf_release(&fingerprint_stdout); return fingerprint_ret; }
-- 2.51.0.463.g79cf913ea9