Merge branch 'cc/replace'

diff --git a/color.h b/color.h
index 6846be1706c1842f5a53abafd4e03758a36695e9..7d8da6fe2207ae4adb7ab888edd57ab571665458 100644 (file)
--- a/color.h
+++ b/color.h
@@ -11,6 +11,7 @@
 #define GIT_COLOR_GREEN                "\033[32m"
 #define GIT_COLOR_YELLOW       "\033[33m"
 #define GIT_COLOR_BLUE         "\033[34m"
+#define GIT_COLOR_MAGENTA      "\033[35m"
 #define GIT_COLOR_CYAN         "\033[36m"
 #define GIT_COLOR_BG_RED       "\033[41m"
 
@@ -28,7 +29,9 @@ int git_color_default_config(const char *var, const char *value, void *cb);
 int git_config_colorbool(const char *var, const char *value, int stdout_is_tty);
 void color_parse(const char *value, const char *var, char *dst);
 void color_parse_mem(const char *value, int len, const char *var, char *dst);
+__attribute__((format (printf, 3, 4)))
 int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
+__attribute__((format (printf, 3, 4)))
 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);