Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1666332

[PATCH v3 5/6] Fix function prototypes for __vwarning, __vpr_stat, and __vdie

Show all headers | View raw

They were declared:
  (const char *fmt, ...)
but implemented as:
  (const char *fmt, va_list ap)

Signed-off-by: Michael Sartain <mikesart@fastmail.com>
---
 event-utils.h | 4 ++--
 parse-utils.c | 2 ++
 trace-local.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/event-utils.h b/event-utils.h
index d1dc217..f709db2 100644
--- a/event-utils.h
+++ b/event-utils.h
@@ -31,8 +31,8 @@ void vpr_stat(const char *fmt, va_list ap);
 void __warning(const char *fmt, ...);
 void __pr_stat(const char *fmt, ...);
 
-void __vwarning(const char *fmt, ...);
-void __vpr_stat(const char *fmt, ...);
+void __vwarning(const char *fmt, va_list ap);
+void __vpr_stat(const char *fmt, va_list ap);
 
 #define min(x, y) ({				\
 	typeof(x) _min1 = (x);			\
diff --git a/parse-utils.c b/parse-utils.c
index 42c1885..5cc9688 100644
--- a/parse-utils.c
+++ b/parse-utils.c
@@ -23,6 +23,8 @@
 #include <stdarg.h>
 #include <errno.h>
 
+#include "event-utils.h"
+
 #define __weak __attribute__((weak))
 
 void __vwarning(const char *fmt, va_list ap)
diff --git a/trace-local.h b/trace-local.h
index fa987bc..fb9f599 100644
--- a/trace-local.h
+++ b/trace-local.h
@@ -198,6 +198,6 @@ int count_cpus(void);
 void die(const char *fmt, ...); /* Can be overriden */
 void *malloc_or_die(unsigned int size); /* Can be overridden */
 void __die(const char *fmt, ...);
-void __vdie(const char *fmt, ...);
+void __vdie(const char *fmt, va_list ap);
 
 #endif /* __TRACE_LOCAL_H */
-- 
2.11.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/6] trace-cmd: escape sequence, EINTR, error checking bug fixes Michael Sartain <mikesart@fastmail.com> - 2017-06-15 02:30 +0200
  [PATCH v3 6/6] Fix cases where string literals were passed as string format args Michael Sartain <mikesart@fastmail.com> - 2017-06-15 02:30 +0200
  [PATCH v3 2/6] Fix unsigned return values being error checked as negative Michael Sartain <mikesart@fastmail.com> - 2017-06-15 02:30 +0200
  [PATCH v3 5/6] Fix function prototypes for __vwarning, __vpr_stat, and __vdie Michael Sartain <mikesart@fastmail.com> - 2017-06-15 02:30 +0200
  [PATCH v3 4/6] Fix read / write data offsets in read / write loops Michael Sartain <mikesart@fastmail.com> - 2017-06-15 02:30 +0200

csiph-web