Skip to content

Commit

Permalink
string_list_add_refs_from_colon_sep(): use string_list_split()
Browse files Browse the repository at this point in the history
It makes for simpler code than strbuf_split().

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Acked-by: Johan Herland <johan@herland.net>
Signed-off-by: Jeff King <peff@peff.net>
  • Loading branch information
Michael Haggerty authored and Jeff King committed Nov 8, 2012
1 parent 031954d commit 6fa2377
Showing 1 changed file with 8 additions and 13 deletions.
21 changes: 8 additions & 13 deletions notes.c
Original file line number Diff line number Diff line change
Expand Up @@ -943,23 +943,18 @@ void string_list_add_refs_by_glob(struct string_list *list, const char *glob)
void string_list_add_refs_from_colon_sep(struct string_list *list,
const char *globs)
{
struct strbuf globbuf = STRBUF_INIT;
struct strbuf **split;
struct string_list split = STRING_LIST_INIT_NODUP;
char *globs_copy = xstrdup(globs);
int i;

strbuf_addstr(&globbuf, globs);
split = strbuf_split(&globbuf, ':');
string_list_split_in_place(&split, globs_copy, ':', -1);
string_list_remove_empty_items(&split, 0);

for (i = 0; split[i]; i++) {
if (split[i]->len && split[i]->buf[split[i]->len-1] == ':')
strbuf_setlen(split[i], split[i]->len-1);
if (!split[i]->len)
continue;
string_list_add_refs_by_glob(list, split[i]->buf);
}
for (i = 0; i < split.nr; i++)
string_list_add_refs_by_glob(list, split.items[i].string);

strbuf_list_free(split);
strbuf_release(&globbuf);
string_list_clear(&split, 0);
free(globs_copy);
}

static int notes_display_config(const char *k, const char *v, void *cb)
Expand Down

0 comments on commit 6fa2377

Please sign in to comment.