X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=snprintf%2Fwcio.h;h=ec2c52e3ee0711f50026af14aca13b252dcd25cb;hb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;hp=1b41ec971d2f2fe9fb58de5f2b894993ed60ac7b;hpb=bf0d695d692163edb23b8fbbbd976387dfef232d;p=lttng-ust.git

diff --git a/snprintf/wcio.h b/snprintf/wcio.h
index 1b41ec97..ec2c52e3 100644
--- a/snprintf/wcio.h
+++ b/snprintf/wcio.h
@@ -1,30 +1,11 @@
 /*	$OpenBSD: wcio.h,v 1.1 2005/06/17 20:40:32 espie Exp $	*/
 /* $NetBSD: wcio.h,v 1.3 2003/01/18 11:30:00 thorpej Exp $ */
 
-/*-
- * Copyright (c)2001 Citrus Project,
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
+/*
+ * SPDX-License-Identifier: BSD-2-Clause
  *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
+ * Copyright (C)2001 Citrus Project,
+ * All rights reserved.
  *
  * $Citrus$
  */
@@ -32,6 +13,9 @@
 #ifndef _WCIO_H_
 #define _WCIO_H_
 
+#include <stddef.h>
+#include <wchar.h>
+
 /* minimal requirement of SUSv2 */
 #define WCIO_UNGETWC_BUFSIZE 1
 
@@ -48,6 +32,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 +63,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_*/