fix clang -Wunused-value warnings for error functions

Commit a469a10 wraps some error calls in macros to give the compiler a chance to do more static analysis on their constant -1 return value. We limit the use of these macros to __GNUC__, since gcc is the primary beneficiary of the new information, and because we use GNU features for handling variadic macros. However, clang also defines __GNUC__, but generates warnings with -Wunused-value when these macros are used in a void context, because the constant "-1" ends up being useless. Gcc does not complain about this case (though it is unclear if it is because it is smart enough to see what we are doing, or too dumb to realize that the -1 is unused). We can squelch the warning by just disabling these macros when clang is in use. Signed-off-by: Max Horn <max@quendi.de> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Max Horn committed Jan 16, 2013 at 10:09 UTC 5ded807f7c0be10ecbb31555e5d10dee553752d6
3 files changed +3 -3
cache.h
+1 -1
@@ -1136,7 +1136,7 @@ extern int check_repository_format_version(const char *var, const char *value, v
1136 extern int git_env_bool(const char *, int);
1137 extern int git_config_system(void);
1138 extern int config_error_nonbool(const char *);
1139 -#ifdef __GNUC__
1139 +#if defined(__GNUC__) && ! defined(__clang__)
1140 #define config_error_nonbool(s) (config_error_nonbool(s), -1)
1141 #endif
1142 extern const char *get_log_output_encoding(void);
git-compat-util.h
+1 -1
@@ -295,7 +295,7 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2)))
295 * behavior. But since we're only trying to help gcc, anyway, it's OK; other
296 * compilers will fall back to using the function as usual.
297 */
298 -#ifdef __GNUC__
298 +#if defined(__GNUC__) && ! defined(__clang__)
299 #define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1)
300 #endif
301
parse-options.h
+1 -1
@@ -177,7 +177,7 @@ extern NORETURN void usage_msg_opt(const char *msg,
177
178 extern int optbug(const struct option *opt, const char *reason);
179 extern int opterror(const struct option *opt, const char *reason, int flags);
180 -#ifdef __GNUC__
180 +#if defined(__GNUC__) && ! defined(clang)
181 #define opterror(o,r,f) (opterror((o),(r),(f)), -1)
182 #endif
183