MonetDB: Aug2011 - Tell compilers about printf formats.

[Sjoerd Mullender]

Changeset: 492a1b69f79a for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=492a1b69f79a
Modified Files:
        monetdb5/mal/mal_exception.mx
        sql/common/sql_string.h
Branch: Aug2011
Log Message:

Tell compilers about printf formats.


diffs (96 lines):

diff --git a/monetdb5/mal/mal_exception.mx b/monetdb5/mal/mal_exception.mx
--- a/monetdb5/mal/mal_exception.mx
+++ b/monetdb5/mal/mal_exception.mx
@@ -155,10 +155,18 @@
 #define rethrow(FCN, TMP, PRV) \
        if ((TMP = PRV) != MAL_SUCCEED) return(TMP);
 
-mal_export str createException(enum malexception, str, str, ...);
-mal_export void        showException(enum malexception, str, str, ...);
-mal_export str createScriptException(MalBlkPtr, int, enum malexception, str, 
str, ...);
-mal_export void        showScriptException(MalBlkPtr, int, enum malexception, 
str, ...);
+mal_export str createException(enum malexception, const char *,
+       _In_z_ _Printf_format_string_ const char *, ...)
+       __attribute__((__format__(__printf__, 3, 4)));
+mal_export void        showException(enum malexception, const char *,
+       _In_z_ _Printf_format_string_ const char *, ...)
+       __attribute__((__format__(__printf__, 3, 4)));
+mal_export str createScriptException(MalBlkPtr, int, enum malexception, const 
char *,
+       _In_z_ _Printf_format_string_ const char *, ...)
+       __attribute__((__format__(__printf__, 5, 6)));
+mal_export void        showScriptException(MalBlkPtr, int, enum malexception,
+       _In_z_ _Printf_format_string_ const char *, ...)
+       __attribute__((__format__(__printf__, 4, 5)));
 mal_export int isExceptionVariable(str nme);
 
 mal_export enum malexception   getExceptionType(str);
@@ -212,7 +220,7 @@
  * is good.
  */
 static str
-createExceptionInternal(enum malexception type, str fcn, str format, va_list 
ap)
+createExceptionInternal(enum malexception type, const char *fcn, const char 
*format, va_list ap)
 {
        char *message;
        int len;
@@ -237,7 +245,7 @@
  * the exceptionNames array.
  */
 str
-createException(enum malexception type, str fcn, str format, ...)
+createException(enum malexception type, const char *fcn, const char *format, 
...)
 {
        va_list ap;
        str ret;
@@ -284,7 +292,7 @@
  * console as defined by GDKout.
  */
 void
-showException(enum malexception type, str fcn, str format, ...)
+showException(enum malexception type, const char *fcn, const char *format, ...)
 {
        va_list ap;
        str msg;
@@ -307,7 +315,7 @@
  * is good.
  */
 static str
-createScriptExceptionInternal(MalBlkPtr mb, int pc, enum malexception type, 
str prev, str format, va_list ap)
+createScriptExceptionInternal(MalBlkPtr mb, int pc, enum malexception type, 
const char *prev, const char *format, va_list ap)
 {
        char buf[GDKMAXERRLEN];
        size_t i;
@@ -337,7 +345,7 @@
  * malexception enum is not aligned with the exceptionNames array.
  */
 str
-createScriptException(MalBlkPtr mb, int pc, enum malexception type, str prev, 
str format, ...)
+createScriptException(MalBlkPtr mb, int pc, enum malexception type, const char 
*prev, const char *format, ...)
 {
        va_list ap;
        str ret;
@@ -355,7 +363,7 @@
  * defined by GDKout.
  */
 void
-showScriptException(MalBlkPtr mb, int pc, enum malexception type, str format, 
...)
+showScriptException(MalBlkPtr mb, int pc, enum malexception type, const char 
*format, ...)
 {
        va_list ap;
        str msg;
diff --git a/sql/common/sql_string.h b/sql/common/sql_string.h
--- a/sql/common/sql_string.h
+++ b/sql/common/sql_string.h
@@ -35,8 +35,10 @@
 extern char *sql_strdup(char *s);
 extern char *sql_escape_str(char *s);
 extern char *sql_escape_ident(char *s);
-extern char *sql_message(const char *format, ...);
-extern char *sa_message(sql_allocator *sa, const char *format, ...);
+extern char *sql_message(_In_z_ _Printf_format_string_ const char *format, ...)
+       __attribute__((__format__(__printf__, 1, 2)));
+extern char *sa_message(sql_allocator *sa, _In_z_ _Printf_format_string_ const 
char *format, ...)
+       __attribute__((__format__(__printf__, 2, 3)));
 
 #endif /*_SQL_STRING_H_*/
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list