[msitools] Get rid of remaining GCC warnings



commit b25fd2b5d8f6a509730473aed90ac1262e4ac1fd
Author: Marc-Andrà Lureau <marcandre lureau gmail com>
Date:   Fri Feb 8 02:34:36 2013 +0100

    Get rid of remaining GCC warnings

 configure.ac       |    1 +
 libmsi/Makefile.am |    1 +
 libmsi/debug.c     |   25 +++++++++++++++++++++++++
 libmsi/debug.h     |   21 +--------------------
 4 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 42a824d..899e9f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,6 +48,7 @@ nw=
 nw="$nw -Wsystem-headers"       # Don't let system headers trigger warnings
 nw="$nw -Wundef"                # All compiler preprocessors support #if UNDEF
 nw="$nw -Wtraditional"          # All compilers nowadays support ANSI C
+nw="$nw -Wstrict-overflow"      # yacc/bison generated code uses that..
 nw="$nw -Wconversion"           # These warnings usually don't point to mistakes.
 nw="$nw -Wsign-conversion"      # Likewise.
 nw="$nw -Wunused-parameter"     # Likewise.
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am
index e026500..09233b1 100644
--- a/libmsi/Makefile.am
+++ b/libmsi/Makefile.am
@@ -14,6 +14,7 @@ BUILT_SOURCES = sql-parser.c sql-parser.h
 libmsi_la_SOURCES =				\
 	alter.c					\
 	create.c				\
+	debug.c					\
 	debug.h					\
 	delete.c				\
 	distinct.c				\
diff --git a/libmsi/debug.c b/libmsi/debug.c
new file mode 100644
index 0000000..e59bd2f
--- /dev/null
+++ b/libmsi/debug.c
@@ -0,0 +1,25 @@
+#include <glib.h>
+#include "debug.h"
+
+G_GNUC_INTERNAL
+const char *wine_dbg_sprintf( const char *format, ...)
+{
+    static char *p_ret[10];
+    static int i;
+
+    char *ret;
+    unsigned len;
+    va_list ap;
+
+    va_start(ap, format);
+    ret = g_strdup_vprintf(format, ap);
+    len = strlen(ret);
+    va_end(ap);
+
+    i = (i + 1) % 10;
+    p_ret[i] = realloc(p_ret[i], len + 1);
+    strcpy(p_ret[i], ret);
+    g_free(ret);
+    return p_ret[i];
+}
+
diff --git a/libmsi/debug.h b/libmsi/debug.h
index 3cc76e5..1f9acc0 100644
--- a/libmsi/debug.h
+++ b/libmsi/debug.h
@@ -59,26 +59,7 @@ static inline const char *wine_dbgstr_an( const char * s, int n )
     return s;
 }
 
-static inline const char *wine_dbg_sprintf( const char *format, ...)
-{
-    static char *p_ret[10];
-    static int i;
-
-    char *ret;
-    unsigned len;
-    va_list ap;
-
-    va_start(ap, format);
-    ret = g_strdup_vprintf(format, ap);
-    len = strlen(ret);
-    va_end(ap);
-
-    i = (i + 1) % 10;
-    p_ret[i] = realloc(p_ret[i], len + 1);
-    strcpy(p_ret[i], ret);
-    g_free(ret);
-    return p_ret[i];
-}
+const char *wine_dbg_sprintf( const char *format, ...);
 
 #define wine_dbg_printf(format,...) (printf(format, ## __VA_ARGS__), fflush(stdout))
 #define WINE_DPRINTF(class, function, format, ...) \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]