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

Remove calculation of the longest command name from where it is not used

Browse Source 
Just calculate it where it is needed - it is cheap and trivial,
as all the lengths are already there (stored when creating the
command lists).

Signed-off-by: Alex Riesen <raa.lkml@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Alex Riesen
2008-08-28 19:15:33 +02:00
committed by Junio C Hamano
parent 63e8aea74e
commit e321180ed3
4 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
builtin-merge.c
View File

@ -80,7 +80,7 @@ static struct strategy *get_strategy(const char *name)
int i;
struct strategy *ret;
static struct cmdnames main_cmds, other_cmds;
static int longest;
static int loaded;
if (!name)
return NULL;
@ -89,14 +89,14 @@ static struct strategy *get_strategy(const char *name)
if (!strcmp(name, all_strategy[i].name))
return &all_strategy[i];
if (!longest) {
if (!loaded) {
struct cmdnames not_strategies;
loaded = 1;
memset(&main_cmds, 0, sizeof(struct cmdnames));
memset(&other_cmds, 0, sizeof(struct cmdnames));
memset(&not_strategies, 0, sizeof(struct cmdnames));
longest = load_command_list("git-merge-", &main_cmds,
&other_cmds);
load_command_list("git-merge-", &main_cmds, &other_cmds);
for (i = 0; i < main_cmds.cnt; i++) {
int j, found = 0;
struct cmdname *ent = main_cmds.names[i];