X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=snprintf%2Fvarious.h;h=7bf14298b83ce2da8ea2ad30c0f69a49af831326;hb=cd61d9bfa5fd334b086831dcbdec63da6c0d1a16;hp=30bedd048be2e9558762e8b13dce9b13c57dfb54;hpb=002e1fde60208d5eea1cfde037672ac23422d8c3;p=lttng-ust.git

diff --git a/snprintf/various.h b/snprintf/various.h
index 30bedd04..7bf14298 100644
--- a/snprintf/various.h
+++ b/snprintf/various.h
@@ -1,39 +1,22 @@
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (C) 1990 The Regents of the University of California.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
- *
- * 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.
- * 3. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
  */
 
 #ifndef UST_SNPRINTF_VARIOUS_H
 #define UST_SNPRINTF_VARIOUS_H
 
 #include <stdarg.h>
+#include <stddef.h>
+#include <stdio.h>
+#include <wchar.h>
+
+#include "ust-helper.h"
 
 struct __lttng_ust_sbuf {
         unsigned char *_base;
@@ -117,9 +100,12 @@ typedef struct __lttng_ust_sFILE {
 
 #define __sferror(p)    (((p)->_flags & __SERR) != 0)
 
+LTTNG_HIDDEN
 extern int ust_safe_fflush(LTTNG_UST_LFILE *fp);
+LTTNG_HIDDEN
 extern int ust_safe_vfprintf(LTTNG_UST_LFILE *fp, const char *fmt0, va_list ap);
 
+LTTNG_HIDDEN
 extern size_t ust_safe_mbrtowc(wchar_t *pwc, const char *s, size_t n, mbstate_t *ps);
 
 #endif /* UST_SNPRINTF_VARIOUS_H */