alias: have SP around arithmetic operators
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
parent
c01499ef69
commit
cc10837929
13
alias.c
13
alias.c
|
|
@ -5,7 +5,7 @@ static char *alias_val;
|
||||||
|
|
||||||
static int alias_lookup_cb(const char *k, const char *v, void *cb)
|
static int alias_lookup_cb(const char *k, const char *v, void *cb)
|
||||||
{
|
{
|
||||||
if (!prefixcmp(k, "alias.") && !strcmp(k+6, alias_key)) {
|
if (!prefixcmp(k, "alias.") && !strcmp(k + 6, alias_key)) {
|
||||||
if (!v)
|
if (!v)
|
||||||
return config_error_nonbool(k);
|
return config_error_nonbool(k);
|
||||||
alias_val = xstrdup(v);
|
alias_val = xstrdup(v);
|
||||||
|
|
@ -34,7 +34,7 @@ int split_cmdline(char *cmdline, const char ***argv)
|
||||||
int src, dst, count = 0, size = 16;
|
int src, dst, count = 0, size = 16;
|
||||||
char quoted = 0;
|
char quoted = 0;
|
||||||
|
|
||||||
*argv = xmalloc(sizeof(char *) * size);
|
*argv = xmalloc(sizeof(**argv) * size);
|
||||||
|
|
||||||
/* split alias_string */
|
/* split alias_string */
|
||||||
(*argv)[count++] = cmdline;
|
(*argv)[count++] = cmdline;
|
||||||
|
|
@ -45,7 +45,7 @@ int split_cmdline(char *cmdline, const char ***argv)
|
||||||
while (cmdline[++src]
|
while (cmdline[++src]
|
||||||
&& isspace(cmdline[src]))
|
&& isspace(cmdline[src]))
|
||||||
; /* skip */
|
; /* skip */
|
||||||
ALLOC_GROW(*argv, count+1, size);
|
ALLOC_GROW(*argv, count + 1, size);
|
||||||
(*argv)[count++] = cmdline + dst;
|
(*argv)[count++] = cmdline + dst;
|
||||||
} else if (!quoted && (c == '\'' || c == '"')) {
|
} else if (!quoted && (c == '\'' || c == '"')) {
|
||||||
quoted = c;
|
quoted = c;
|
||||||
|
|
@ -76,12 +76,13 @@ int split_cmdline(char *cmdline, const char ***argv)
|
||||||
return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
|
return -SPLIT_CMDLINE_UNCLOSED_QUOTE;
|
||||||
}
|
}
|
||||||
|
|
||||||
ALLOC_GROW(*argv, count+1, size);
|
ALLOC_GROW(*argv, count + 1, size);
|
||||||
(*argv)[count] = NULL;
|
(*argv)[count] = NULL;
|
||||||
|
|
||||||
return count;
|
return count;
|
||||||
}
|
}
|
||||||
|
|
||||||
const char *split_cmdline_strerror(int split_cmdline_errno) {
|
const char *split_cmdline_strerror(int split_cmdline_errno)
|
||||||
return split_cmdline_errors[-split_cmdline_errno-1];
|
{
|
||||||
|
return split_cmdline_errors[-split_cmdline_errno - 1];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue