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

From: Michael Sartain
Date: Thu Jun 08 2017 - 17:56:54 EST


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

Signed-off-by: Michael Sartain <mikesart@xxxxxxxxxxxx>
---
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


--vbdhlof7p7wwpskb
Content-Type: text/x-diff; charset=us-ascii
Content-Disposition: attachment; filename="0006-Fix-cases-where-string-literals-were-passed-as-strin.patch"