undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'rs/merge-add-strategies-simplification' into maint

Browse Source 
A small code clean-up.

* rs/merge-add-strategies-simplification:
  merge: use string_list_split() in add_strategies()
This commit is contained in:
Junio C Hamano 2016-09-08 21:35:58 -07:00
commit 24c88ad8d1
1 changed files with 9 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
builtin/merge.c
View File

@ -30,6 +30,7 @@
#include "fmt-merge-msg.h" #include "fmt-merge-msg.h"
#include "gpg-interface.h" #include "gpg-interface.h"
#include "sequencer.h" #include "sequencer.h"
#include "string-list.h"
#define DEFAULT_TWOHEAD (1<<0) #define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1) #define DEFAULT_OCTOPUS (1<<1)
@ -712,42 +713,17 @@ static int count_unmerged_entries(void)
return ret; return ret;
} }
static void split_merge_strategies(const char *string, struct strategy **list,
int *nr, int *alloc)
{
char *p, *q, *buf;
if (!string)
return;
buf = xstrdup(string);
q = buf;
for (;;) {
p = strchr(q, ' ');
if (!p) {
ALLOC_GROW(*list, *nr + 1, *alloc);
(*list)[(*nr)++].name = xstrdup(q);
free(buf);
return;
} else {
*p = '\0';
ALLOC_GROW(*list, *nr + 1, *alloc);
(*list)[(*nr)++].name = xstrdup(q);
q = ++p;
}
}
}
static void add_strategies(const char *string, unsigned attr) static void add_strategies(const char *string, unsigned attr)
{ {
struct strategy *list = NULL; int i;
int list_alloc = 0, list_nr = 0, i;
memset(&list, 0, sizeof(list)); if (string) {
split_merge_strategies(string, &list, &list_nr, &list_alloc); struct string_list list = STRING_LIST_INIT_DUP;
if (list) { struct string_list_item *item;
for (i = 0; i < list_nr; i++) string_list_split(&list, string, ' ', -1);
append_strategy(get_strategy(list[i].name)); for_each_string_list_item(item, &list)
append_strategy(get_strategy(item->string));
string_list_clear(&list, 0);
return; return;
} }
for (i = 0; i < ARRAY_SIZE(all_strategy); i++) for (i = 0; i < ARRAY_SIZE(all_strategy); i++)