Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
alias: have SP around arithmetic operators
author
Felipe Contreras
<felipe.contreras@gmail.com>
Sat, 21 Sep 2013 19:15:44 +0000
(14:15 -0500)
committer
Junio C Hamano
<gitster@pobox.com>
Wed, 16 Oct 2013 17:27:26 +0000
(10:27 -0700)
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
alias.c
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
c01499e
)
diff --git
a/alias.c
b/alias.c
index eb9f08b912b2089d434926fc6083ac5ab90c73bc..9938f03c255029ee8f5b10623e5e7bb65f2d7921 100644
(file)
--- a/
alias.c
+++ b/
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)
return config_error_nonbool(k);
alias_val = xstrdup(v);
if (!v)
return config_error_nonbool(k);
alias_val = xstrdup(v);
@@
-34,7
+34,7
@@
int split_cmdline(char *cmdline, const char ***argv)
int src, dst, count = 0, size = 16;
char quoted = 0;
int src, dst, count = 0, size = 16;
char quoted = 0;
- *argv = xmalloc(sizeof(
char *
) * size);
+ *argv = xmalloc(sizeof(
**argv
) * size);
/* split alias_string */
(*argv)[count++] = cmdline;
/* split alias_string */
(*argv)[count++] = cmdline;
@@
-45,7
+45,7
@@
int split_cmdline(char *cmdline, const char ***argv)
while (cmdline[++src]
&& isspace(cmdline[src]))
; /* skip */
while (cmdline[++src]
&& isspace(cmdline[src]))
; /* skip */
- ALLOC_GROW(*argv, count
+
1, size);
+ ALLOC_GROW(*argv, count
+
1, size);
(*argv)[count++] = cmdline + dst;
} else if (!quoted && (c == '\'' || c == '"')) {
quoted = c;
(*argv)[count++] = cmdline + dst;
} else if (!quoted && (c == '\'' || 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;
return count;
}
(*argv)[count] = NULL;
return count;
}
-const char *split_cmdline_strerror(int split_cmdline_errno) {
- return split_cmdline_errors[-split_cmdline_errno-1];
+const char *split_cmdline_strerror(int split_cmdline_errno)
+{
+ return split_cmdline_errors[-split_cmdline_errno - 1];
}
}