Add printf format checks to util's log functions

[openafs.git] / src / util / afsutil.h

diff --git a/src/util/afsutil.h b/src/util/afsutil.h
index 4b8832e..3aa037b 100644 (file)
--- a/src/util/afsutil.h
+++ b/src/util/afsutil.h
@@ -31,6 +31,7 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 
 extern int LogLevel;
 extern int mrafsStyleLogs;
@@ -39,10 +40,14 @@ extern int serverLogSyslog;
 extern int serverLogSyslogFacility;
 extern char *serverLogSyslogTag;
 #endif
-extern void vFSLog(const char *format, va_list args);
+extern void vFSLog(const char *format, va_list args)
+       AFS_ATTRIBUTE_FORMAT(__printf__, 1, 0);
+
 extern void SetLogThreadNumProgram(int (*func) (void) );
 
-/*@printflike@*/ extern void FSLog(const char *format, ...);
+extern void FSLog(const char *format, ...)
+       AFS_ATTRIBUTE_FORMAT(__printf__, 1, 2);
+
 #define ViceLog(level, str)  do { if ((level) <= LogLevel) (FSLog str); } while (0)
 #define vViceLog(level, str) do { if ((level) <= LogLevel) (vFSLog str); } while (0)
 
@@ -53,26 +58,31 @@ extern void SetupLogSignals(void);
 extern int
 afs_vsnprintf( /*@out@ */ char *p, size_t avail, const char *fmt,
              va_list ap)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 3, 0)
     /*@requires maxSet(p) >= (avail-1)@ */
     /*@modifies p@ */ ;
 
 extern /*@printflike@ */ int
-afs_snprintf( /*@out@ */ char *p, size_t avail,
-                   const char *fmt, ...)
+afs_snprintf( /*@out@ */ char *p, size_t avail, const char *fmt, ...)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 3, 4)
     /*@requires maxSet(p) >= (avail-1)@ */
     /*@modifies p@ */ ;
 
 extern int
-afs_vasnprintf (char **ret, size_t max_sz, const char *format, va_list args);
+afs_vasnprintf (char **ret, size_t max_sz, const char *format, va_list args)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 3, 0);
 
 extern int
-afs_vasprintf (char **ret, const char *format, va_list args);
+afs_vasprintf (char **ret, const char *format, va_list args)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 2, 0);
 
 extern int
-afs_asprintf (char **ret, const char *format, ...);
+afs_asprintf (char **ret, const char *format, ...)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 2, 3);
 
 extern int
-afs_asnprintf (char **ret, size_t max_sz, const char *format, ...);
+afs_asnprintf (char **ret, size_t max_sz, const char *format, ...)
+    AFS_ATTRIBUTE_FORMAT(__printf__, 3, 4);
 
 /* special version of ctime that clobbers a *different static variable, so
  * that ViceLog can call ctime and not cause buffer confusion.
@@ -88,8 +98,19 @@ extern char *vctime(const time_t * atime);
 #define afs_ctime(C, B, L) (char*)ctime_r(C, B)
 #endif /* AFS_SUN5_ENV */
 #else /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
-#define afs_ctime(C, B, S) \
-       ((void)strncpy(B, ctime(C), (S-1)), (B)[S-1] = '\0', (B))
+static_inline char *
+afs_ctime(const time_t *C, char *B, size_t S) {
+#if !defined(AFS_NT40_ENV) || (_MSC_VER < 1400)
+    strncpy(B, ctime(C), (S-1));
+    B[S-1] = '\0';
+#else
+    char buf[32];
+    if (ctime_s(buf, sizeof(buf), C) ||
+        strncpy_s(B, S, buf, _TRUNCATE))
+         B[0] = '\0';
+#endif
+    return B;
+}
 #endif /* AFS_PTHREAD_ENV && !AFS_NT40_ENV */
 
 
@@ -120,14 +141,15 @@ extern char *vctime(const time_t * atime);
 /* Unbuffer output when Un*x would do line buffering. */
 #define setlinebuf(S) setvbuf(S, NULL, _IONBF, 0)
 
-/* regular expression parser for NT */
-     extern char *re_comp(char *sp);
-     extern int rc_exec(char *p);
-
 /* Abort on error, possibly trapping to debugger or dumping a trace. */
      void afs_NTAbort(void);
 #endif /* AFS_NT40_ENV */
 
+#ifndef HAVE_POSIX_REGEX
+extern char *re_comp(const char *sp);
+extern int re_exec(const char *p1);
+#endif
+
      typedef char b32_string_t[8];
 /* b64_string_t is 8 bytes, in stds.h */
      typedef char lb64_string_t[12];