From: Redirect 'Slash' NIL <redirect.slash.nil@gmail.com>
Date: Sun, 18 Oct 2009 00:47:52 +0000 (-0700)
Subject: More MinGW C99 printf compliance
X-Git-Tag: v0.3.0-rc0~76
X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=73349dc5ac33e904a1311829f2e42d923309e744

More MinGW C99 printf compliance

Passing "--std=gun99" is unfortunately not sufficient to make current
MinGW compilers conform with respect to checking printf format strings.
(The C runtime seems not to have problems.)

Fix by using a "gnu_printf" format specifier not "printf".
---

diff --git a/src/helper/command.h b/src/helper/command.h
index 2b9f1a1623..c574efd507 100644
--- a/src/helper/command.h
+++ b/src/helper/command.h
@@ -35,6 +35,14 @@
 #include "jim.h"
 #endif
 
+/* To achieve C99 printf compatibility in MinGW, gnu_printf should */
+/* be used for __attribute__((format( ... )))                      */
+#ifdef IS_MINGW
+#define PRINTF_ATTRIBUTE_FORMAT gnu_printf
+#else
+#define PRINTF_ATTRIBUTE_FORMAT printf
+#endif
+
 enum command_mode
 {
 	COMMAND_EXEC,
@@ -85,12 +93,12 @@ extern command_context_t* command_init(void);
 extern int command_done(command_context_t *context);
 
 extern void command_print(command_context_t *context, const char *format, ...)
-		__attribute__ ((format (printf, 2, 3)));
+		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
 extern void command_print_sameline(command_context_t *context, const char *format, ...)
-		__attribute__ ((format (printf, 2, 3)));
+		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
 extern int command_run_line(command_context_t *context, char *line);
 extern int command_run_linef(command_context_t *context, const char *format, ...)
-		__attribute__ ((format (printf, 2, 3)));
+		__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 2, 3)));
 extern void command_output_text(command_context_t *context, const char *data);
 
 extern void process_jim_events(void);
diff --git a/src/helper/log.h b/src/helper/log.h
index 7fc5a886e8..8f6ac7706d 100644
--- a/src/helper/log.h
+++ b/src/helper/log.h
@@ -28,6 +28,14 @@
 
 #include "command.h"
 
+/* To achieve C99 printf compatibility in MinGW, gnu_printf should */
+/* be used for __attribute__((format( ... )))                      */
+#ifdef IS_MINGW
+#define PRINTF_ATTRIBUTE_FORMAT gnu_printf
+#else
+#define PRINTF_ATTRIBUTE_FORMAT printf
+#endif
+
 /* logging priorities
  * LOG_LVL_SILENT - turn off all output. In lieu of try + catch this can be used as a
  *                  feeble ersatz.
@@ -52,10 +60,10 @@ enum log_levels
 
 extern void log_printf(enum log_levels level, const char *file, int line,
 	const char *function, const char *format, ...)
-__attribute__ ((format (printf, 5, 6)));
+__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 extern void log_printf_lf(enum log_levels level, const char *file, int line,
 	const char *function, const char *format, ...)
-__attribute__ ((format (printf, 5, 6)));
+__attribute__ ((format (PRINTF_ATTRIBUTE_FORMAT, 5, 6)));
 extern int log_register_commands(struct command_context_s *cmd_ctx);
 extern int log_init(struct command_context_s *cmd_ctx);
 extern int set_log_output(struct command_context_s *cmd_ctx, FILE *output);
diff --git a/src/target/arm11.h b/src/target/arm11.h
index 61c5f7f9b1..9afff23d7c 100644
--- a/src/target/arm11.h
+++ b/src/target/arm11.h
@@ -33,8 +33,9 @@
 	type * variable = calloc(1, sizeof(type) * items)
 
 /* For MinGW use 'I' prefix to print size_t (instead of 'z') */
+/* Except if __USE_MINGW_ANSI_STDIO is defined with MinGW    */
 
-#ifndef __MSVCRT__
+#if (!defined(__MSVCRT__) || defined(__USE_MINGW_ANSI_STDIO))
 #define ZU		"%zu"
 #else
 #define ZU		"%Iu"