undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
* jk/squelch-false-warning-from-gcc-o3:
  color_parse_mem: initialize "struct color" temporary
  error_errno: use constant return similar to error()
This commit is contained in:
Junio C Hamano 2016-09-12 15:34:33 -07:00
commit 368332c471
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
color.c
View File

@ -215,7 +215,7 @@ int color_parse_mem(const char *value, int value_len, char *dst)
/* [fg [bg]] [attr]... */ /* [fg [bg]] [attr]... */
while (len > 0) { while (len > 0) {
const char *word = ptr; const char *word = ptr;
struct color c; struct color c = { COLOR_UNSPECIFIED };
int val, wordlen = 0; int val, wordlen = 0;
while (len > 0 && !isspace(word[wordlen])) { while (len > 0 && !isspace(word[wordlen])) {

1
git-compat-util.h
View File

@ -436,6 +436,7 @@ static inline int const_error(void)
return -1; return -1;
} }
#define error(...) (error(__VA_ARGS__), const_error()) #define error(...) (error(__VA_ARGS__), const_error())
#define error_errno(...) (error_errno(__VA_ARGS__), const_error())
#endif #endif
extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)); extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params));

1
usage.c
View File

@ -148,6 +148,7 @@ void NORETURN die_errno(const char *fmt, ...)
va_end(params); va_end(params);
} }
#undef error_errno
int error_errno(const char *fmt, ...) int error_errno(const char *fmt, ...)
{ {
char buf[1024]; char buf[1024];