diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-09-19 23:51:41 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-09-19 23:51:41 +0300 |
commit | 3d54b93f405c6881ac477c5bfec10802ea53f73d (patch) | |
tree | c75a7d1af7dc617539d05c7eae34df0ef36d8a94 | |
parent | 1e28677e5b16515518bdd1dbef02ca48a4438c4e (diff) | |
parent | 3e1952ed96dde926ce38a8ab8803f9a410ecdae3 (diff) |
Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint
Compilation fix.
* jk/squelch-false-warning-from-gcc-o3:
color_parse_mem: initialize "struct color" temporary
error_errno: use constant return similar to error()
-rw-r--r-- | color.c | 2 | ||||
-rw-r--r-- | git-compat-util.h | 1 | ||||
-rw-r--r-- | usage.c | 1 |
3 files changed, 3 insertions, 1 deletions
@@ -215,7 +215,7 @@ int color_parse_mem(const char *value, int value_len, char *dst) /* [fg [bg]] [attr]... */ while (len > 0) { const char *word = ptr; - struct color c; + struct color c = { COLOR_UNSPECIFIED }; int val, wordlen = 0; while (len > 0 && !isspace(word[wordlen])) { diff --git a/git-compat-util.h b/git-compat-util.h index db89ba7748..2ad45b3f75 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -436,6 +436,7 @@ static inline int const_error(void) return -1; } #define error(...) (error(__VA_ARGS__), const_error()) +#define error_errno(...) (error_errno(__VA_ARGS__), const_error()) #endif extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)); @@ -148,6 +148,7 @@ void NORETURN die_errno(const char *fmt, ...) va_end(params); } +#undef error_errno int error_errno(const char *fmt, ...) { char buf[1024]; |