mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t/helper/test-oidmap.c: avoid using strtok()

Browse Source 
Apply similar treatment as in the previous commit to remove usage of
`strtok()` from the "oidmap" test helper.

Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Taylor Blau
2023-04-24 18:20:20 -04:00
committed by Junio C Hamano
parent 826f0e33ab
commit deeabc1ff0
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
t/helper/test-oidmap.c
View File

@ -4,6 +4,7 @@
#include "oidmap.h"
#include "setup.h"
#include "strbuf.h"
#include "string-list.h"
/* key is an oid and value is a name (could be a refname for example) */
struct test_entry {
@ -25,6 +26,7 @@ struct test_entry {
*/
int cmd__oidmap(int argc UNUSED, const char **argv UNUSED)
{
struct string_list parts = STRING_LIST_INIT_NODUP;
struct strbuf line = STRBUF_INIT;
struct oidmap map = OIDMAP_INIT;
@ -35,19 +37,24 @@ int cmd__oidmap(int argc UNUSED, const char **argv UNUSED)
/* process commands from stdin */
while (strbuf_getline(&line, stdin) != EOF) {
char *cmd, *p1 = NULL, *p2 = NULL;
char *cmd, *p1, *p2;
struct test_entry *entry;
struct object_id oid;
/* break line into command and up to two parameters */
cmd = strtok(line.buf, DELIM);
string_list_setlen(&parts, 0);
string_list_split_in_place(&parts, line.buf, DELIM, 2);
string_list_remove_empty_items(&parts, 0);
/* ignore empty lines */
if (!cmd || *cmd == '#')
if (!parts.nr)
continue;
if (!*parts.items[0].string || *parts.items[0].string == '#')
continue;
p1 = strtok(NULL, DELIM);
if (p1)
p2 = strtok(NULL, DELIM);
cmd = parts.items[0].string;
p1 = parts.nr >= 1 ? parts.items[1].string : NULL;
p2 = parts.nr >= 2 ? parts.items[2].string : NULL;
if (!strcmp("put", cmd) && p1 && p2) {
@ -108,6 +115,7 @@ int cmd__oidmap(int argc UNUSED, const char **argv UNUSED)
}
}
string_list_clear(&parts, 0);
strbuf_release(&line);
oidmap_free(&map, 1);
return 0;