X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=snprintf%2Fvfprintf.c;h=c2b07eb0bce59a2a0cf569de8a9cd6a4955a0294;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=cedd4fb7eb9e408c498b3ba901cd4180ef0d4569;hpb=c993aa602df5d770ea1da811c4f7f643dde1ed34;p=lttng-ust.git

diff --git a/snprintf/vfprintf.c b/snprintf/vfprintf.c
index cedd4fb7..c2b07eb0 100644
--- a/snprintf/vfprintf.c
+++ b/snprintf/vfprintf.c
@@ -1,34 +1,12 @@
 /*	$OpenBSD: vfprintf.c,v 1.57 2009/10/28 21:15:02 naddy Exp $	*/
-/*-
- * 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.
  */
 
 /*
@@ -51,9 +29,14 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
+#include <wchar.h>
 
 #include "local.h"
 #include "fvwrite.h"
+#include "various.h"
+
+static char null_str[] = "(null)";
+static char bad_base_str[] = "bug in ust_safe_vfprintf: bad base";
 
 union arg {
 	int			intarg;
@@ -735,7 +718,7 @@ fp_common:
 			goto nosign;
 		case 's':
 			if ((cp = GETARG(char *)) == NULL)
-				cp = "(null)";
+				cp = null_str;
 			if (prec >= 0) {
 				/*
 				 * can't use strlen; can only look for the
@@ -822,7 +805,7 @@ number:			if ((dprec = prec) >= 0)
 					break;
 
 				default:
-					cp = "bug in ust_safe_vfprintf: bad base";
+					cp = bad_base_str;
 					size = strlen(cp);
 					goto skipsize;
 				}
@@ -934,7 +917,6 @@ number:			if ((dprec = prec) >= 0)
 done:
 	FLUSH();
 error:
-	va_end(orgap);
 	if (__sferror(fp))
 		ret = -1;
 	goto finish;
@@ -944,6 +926,7 @@ overflow:
 	ret = -1;
 
 finish:
+	va_end(orgap);
 #ifdef FLOATING_POINT
 	if (dtoaresult)
 		__freedtoa(dtoaresult);
@@ -1350,7 +1333,7 @@ __grow_type_table(unsigned char **typetable, int *tablesize)
 	return (0);
 }
 
- 
+
 #ifdef FLOATING_POINT
 static int
 exponent(char *p0, int exp, int fmtch)