Add autoconf test for vsnprintf to make the ifdef in ick_snprintf_or_die() correct...

diff --git a/configure.ac b/configure.ac
index dec0117da0bfe84f4fc4b6470ed3b1dd17c35294..d46c5fd8817a09cc97a4d66635d9b7b530ff792e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ fi
 AC_DEFINE_UNQUOTED([EXEEXT],"$EXEEXT",[Extension to use on executable files.])
 
 dnl Checks for library functions.
-AC_CHECK_FUNCS(gettimeofday gethrtime strdup strtol strtoul snprintf)
+AC_CHECK_FUNCS(gettimeofday gethrtime strdup strtol strtoul snprintf vsnprintf)
 ICK_SAVECFLAGS=$CFLAGS
 CFLAGS="$CFLAGS -lrt"
 AC_CHECK_FUNCS(clock_gettime)

diff --git a/src/uncommon.c b/src/uncommon.c
index 0dc93e303dd0500ea4bd4828f59e1d2e749c6d33..d792daf06c15de2390c2c5b8a977895403ffedee 100644 (file)
--- a/src/uncommon.c
+++ b/src/uncommon.c
@@ -168,12 +168,12 @@ int ick_printfopens=0;
  * Invoke snprintf(), if supported. Otherwise invoke sprintf() and abort
  * if we did overflow.
  */
-int ick_snprintf_or_die(char *str, size_t size, const char *format, ...)
+int ick_snprintf_or_die(/*@out@*/ char *str, size_t size, /*@observer@*/ const char *format, ...)
 {
   va_list ap;
   int retval;
   va_start(ap, format);
-#ifdef HAVE_SNPRINTF
+#ifdef HAVE_VSNPRINTF
   retval = vsnprintf(str, size, format, ap);
 #else
   retval = vsprintf(str, format, ap);

diff --git a/src/uncommon.h b/src/uncommon.h
index 3144680ffe03c711a8d5ca7b0841d45b8396c48d..c3c25cddffe490355e96f49fc6d1cb96fe902f2d 100644 (file)
--- a/src/uncommon.h
+++ b/src/uncommon.h
@@ -6,7 +6,7 @@
 /*@null@*/ /*@dependent@*/ extern FILE* ick_findandfopen(/*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*);
 /*@observer@*/ /*@null@*/ extern const char* ick_findandtestopen(/*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*);
 /*@null@*/ /*@dependent@*/ extern FILE* ick_findandfreopen(/*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*, /*@observer@*/ const char*, FILE*);
-extern int ick_snprintf_or_die(char *str, size_t size, const char *format, ...)
+extern int ick_snprintf_or_die(/*@out@*/ char *str, size_t size, /*@observer@*/ const char *format, ...)
 #ifdef __GNUC__
   __attribute__ ((format(printf, 3, 4)))
 #endif