X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=snprintf%2Ffileext.h;h=d215c8603ac5378683ed9bbe87e380503fd133a1;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=2d070430248d28971c43db9216fe1fa7f7ba51cd;hpb=bf0d695d692163edb23b8fbbbd976387dfef232d;p=lttng-ust.git

diff --git a/snprintf/fileext.h b/snprintf/fileext.h
index 2d070430..d215c860 100644
--- a/snprintf/fileext.h
+++ b/snprintf/fileext.h
@@ -1,30 +1,11 @@
 /*	$OpenBSD: fileext.h,v 1.2 2005/06/17 20:40:32 espie Exp $	*/
 /* $NetBSD: fileext.h,v 1.5 2003/07/18 21:46:41 nathanw 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,12 +13,12 @@
 /*
  * file extension
  */
-struct __sfileext {
-	struct	__sbuf _ub; /* ungetc buffer */
+struct __lttng_ust_sfileext {
+	struct	__lttng_ust_sbuf _ub; /* ungetc buffer */
 	struct wchar_io_data _wcio;	/* wide char io status */
 };
 
-#define _EXT(fp) ((struct __sfileext *)((fp)->_ext._base))
+#define _EXT(fp) ((struct __lttng_ust_sfileext *)((fp)->_ext._base))
 #define _UB(fp) _EXT(fp)->_ub
 
 #define _FILEEXT_INIT(fp) \