From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Fri, 19 Feb 2010 22:27:29 +0000 (-0500)
Subject: snprintf: fix warning about non null argument
X-Git-Tag: v0.3~36
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=240578adf0e495c1cbe5d7558ed8ef72a5bf02a7;p=ust.git

snprintf: fix warning about non null argument
---

diff --git a/snprintf/wcio.h b/snprintf/wcio.h
index 1b41ec9..0c955e5 100644
--- a/snprintf/wcio.h
+++ b/snprintf/wcio.h
@@ -48,6 +48,9 @@ struct wchar_io_data {
 #define WCIO_GET(fp) \
 	(_EXT(fp) ? &(_EXT(fp)->_wcio) : (struct wchar_io_data *)0)
 
+#define WCIO_GET_NONULL(fp) \
+	(&(_EXT(fp)->_wcio))
+
 #define _SET_ORIENTATION(fp, mode) \
 do {\
 	struct wchar_io_data *_wcio = WCIO_GET(fp); \
@@ -76,6 +79,6 @@ do {\
 } while (0)
 
 #define WCIO_INIT(fp) \
-	memset(WCIO_GET(fp), 0, sizeof(struct wchar_io_data))
+	memset(WCIO_GET_NONULL(fp), 0, sizeof(struct wchar_io_data))
 
 #endif /*_WCIO_H_*/