Merge branch 'jk/squelch-false-warning-from-gcc-o3' into maint

gitster · gitster · commit 3d54b93f405c · 2016-09-19T13:51:41.000-07:00
Compilation fix.

* jk/squelch-false-warning-from-gcc-o3:
  color_parse_mem: initialize "struct color" temporary
  error_errno: use constant return similar to error()
diff --git a/color.c b/color.c
@@ -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
@@ -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));
diff --git a/usage.c b/usage.c
@@ -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];

Original file line number	Diff line number	Diff line change
`@@ -436,6 +436,7 @@ static inline int const_error(void)`
`436`	`436`	`return -1;`
`437`	`437`	`}`
`438`	`438`	`#define error(...) (error(__VA_ARGS__), const_error())`
	`439`	`+#define error_errno(...) (error_errno(__VA_ARGS__), const_error())`
`439`	`440`	`#endif`
`440`	`441`
`441`	`442`	`extern void set_die_routine(NORETURN_PTR void (routine)(const char err, va_list params));`
Original file line number	Diff line number	Diff line change
`@@ -148,6 +148,7 @@ void NORETURN die_errno(const char *fmt, ...)`
`148`	`148`	`va_end(params);`
`149`	`149`	`}`
`150`	`150`
	`151`	`+#undef error_errno`
`151`	`152`	`int error_errno(const char *fmt, ...)`
`152`	`153`	`{`
`153`	`154`	`char buf[1024];`