Changeset e1868fb

Timestamp:

12/31/06 17:41:10 (14 years ago)

Author:

Perry Lorier <perry@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

4746c71

Parents:

e2d49d5

Message:

Add attribute((format(printf))) flags to functions that should have it.
Found a nasty bug in trace_get_server_port() where the body of an if() wasn't
correctly {}'d.

Location:

lib

Files:

• libtrace.h.in (modified) (3 diffs)
• libtrace_int.h (modified) (1 diff)
• trace.c (modified) (2 diffs)

lib/libtrace.h.in

@@ -140 +140 @@
 #  define UNUSED __attribute__((unused))
 #  define PACKED __attribute__((packed))
+#  define PRINTF(formatpos,argpos) __attribute__((format(printf,formatpos,argpos)))
 #else
 #  define SIMPLE_FUNCTION
 #  define UNUSED
 #  define PACKED 
+#  define PRINTF(formatpos,argpos) 
 #endif
         
@@ -787 +789 @@
  * This function does clear the error status.
  */
-DLLEXPORT void trace_perror(libtrace_t *trace, const char *msg,...);
+DLLEXPORT void trace_perror(libtrace_t *trace, const char *msg,...) PRINTF(2,3);
 
 /** Check (and clear) the current error state of an output trace
@@ -808 +810 @@
  * This function does clear the error status.
  */
-DLLEXPORT void trace_perror_output(libtrace_out_t *trace, const char *msg,...);
+DLLEXPORT void trace_perror_output(libtrace_out_t *trace, const char *msg,...)
+        PRINTF(2,3);
 
 

lib/libtrace_int.h

@@ -150 +150 @@
 };
 
-void trace_set_err(libtrace_t *trace, int errcode,const char *msg,...);
-void trace_set_err_out(libtrace_out_t *trace, int errcode, const char *msg,...);
+void trace_set_err(libtrace_t *trace, int errcode,const char *msg,...) 
+                                                                PRINTF(3,4);
+void trace_set_err_out(libtrace_out_t *trace, int errcode, const char *msg,...)
+                                                                PRINTF(3,4);
 
 typedef struct libtrace_sll_header_t {

lib/trace.c

@@ -241 +241 @@
  * and then prints out the help() function registered with each input module
  */
-DLLEXPORT void trace_help() {
+DLLEXPORT void trace_help(void) {
         struct libtrace_format_t *tmp;
         trace_init();
@@ -1171 +1171 @@
 
         /* dynamic range */
-        if (DYNAMIC(source) && DYNAMIC(dest))
+        if (DYNAMIC(source) && DYNAMIC(dest)) {
                 if (source < dest)
                         return USE_SOURCE;
                 return USE_DEST;
+        }
         if (DYNAMIC(source) && !DYNAMIC(dest))
                 return USE_DEST;