Skip to content

Commit 80b6b12

Browse files
chriscoolgitster
authored andcommitted
promisor-remote: refactor initialising field lists
In "promisor-remote.c", the fields_sent() and fields_checked() functions serve similar purposes and contain a small amount of duplicated code. As we are going to add a similar function in a following commit, let's refactor this common code into a new initialize_fields_list() function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 864f55e commit 80b6b12

1 file changed

Lines changed: 14 additions & 14 deletions

File tree

promisor-remote.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -375,32 +375,32 @@ static char *fields_from_config(struct string_list *fields_list, const char *con
375375
return fields;
376376
}
377377

378+
static struct string_list *initialize_fields_list(struct string_list *fields_list, int *initialized,
379+
const char *config_key)
380+
{
381+
if (!*initialized) {
382+
fields_list->cmp = strcasecmp;
383+
fields_from_config(fields_list, config_key);
384+
*initialized = 1;
385+
}
386+
387+
return fields_list;
388+
}
389+
378390
static struct string_list *fields_sent(void)
379391
{
380392
static struct string_list fields_list = STRING_LIST_INIT_NODUP;
381393
static int initialized;
382394

383-
if (!initialized) {
384-
fields_list.cmp = strcasecmp;
385-
fields_from_config(&fields_list, "promisor.sendFields");
386-
initialized = 1;
387-
}
388-
389-
return &fields_list;
395+
return initialize_fields_list(&fields_list, &initialized, "promisor.sendFields");
390396
}
391397

392398
static struct string_list *fields_checked(void)
393399
{
394400
static struct string_list fields_list = STRING_LIST_INIT_NODUP;
395401
static int initialized;
396402

397-
if (!initialized) {
398-
fields_list.cmp = strcasecmp;
399-
fields_from_config(&fields_list, "promisor.checkFields");
400-
initialized = 1;
401-
}
402-
403-
return &fields_list;
403+
return initialize_fields_list(&fields_list, &initialized, "promisor.checkFields");
404404
}
405405

406406
/*

0 commit comments

Comments
 (0)