X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=snprintf%2Fsnprintf.c;h=200120882a59bdbb9586c83f6c204637606fe3f3;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=bbc66a0743982a6bde5a925a689dbbaa4a7a441e;hpb=a2adb105d815cfbcf9bf8f870f2f72f79a319138;p=lttng-ust.git

diff --git a/snprintf/snprintf.c b/snprintf/snprintf.c
index bbc66a07..20012088 100644
--- a/snprintf/snprintf.c
+++ b/snprintf/snprintf.c
@@ -1,47 +1,28 @@
 /*	$OpenBSD: snprintf.c,v 1.16 2009/10/22 01:23:16 guenther Exp $ */
-/*-
- * Copyright (c) 1990, 1993
+/*
+ * SPDX-License-Identifier: BSD-3-Clause
+ *
+ * Copyright (C) 1990, 1993
  *	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.
  */
 
 #include <limits.h>
+#include <stddef.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
 #include "local.h"
 #include "ust_snprintf.h"
 
+#define DUMMY_LEN	1
+
 int ust_safe_vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 {
 	int ret;
-	char dummy;
+	char dummy[DUMMY_LEN];
 	LTTNG_UST_LFILE f;
 	struct __lttng_ust_sfileext fext;
 
@@ -50,8 +31,8 @@ int ust_safe_vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 		n = INT_MAX;
 	/* Stdio internals do not deal correctly with zero length buffer */
 	if (n == 0) {
-		str = &dummy;
-		n = 1;
+		str = dummy;
+		n = DUMMY_LEN;
 	}
 	_FILEEXT_SETUP(&f, &fext);
 	f._file = -1;