pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/libnbcompat/files Move my code to two-clause ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/40e75e520931
branches: trunk
changeset: 538637:40e75e520931
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Feb 14 19:14:54 2008 +0000
description:
Move my code to two-clause license.
diffstat:
pkgtools/libnbcompat/files/snprintf.c | 41 +++++++++++++---------------------
1 files changed, 16 insertions(+), 25 deletions(-)
diffs (80 lines):
diff -r b073ada87315 -r 40e75e520931 pkgtools/libnbcompat/files/snprintf.c
--- a/pkgtools/libnbcompat/files/snprintf.c Thu Feb 14 19:13:23 2008 +0000
+++ b/pkgtools/libnbcompat/files/snprintf.c Thu Feb 14 19:14:54 2008 +0000
@@ -1,12 +1,9 @@
-/* $NetBSD: snprintf.c,v 1.5 2007/07/20 00:11:25 tnn Exp $ */
+/* $NetBSD: snprintf.c,v 1.6 2008/02/14 19:14:54 tnn Exp $ */
/*-
- * Copyright (c) 2007 The NetBSD Foundation, Inc.
+ * Copyright (c) 2007 Tobias Nygren <tnn%NetBSD.org@localhost>
* All rights reserved.
*
- * This code is derived from software contributed to The NetBSD Foundation
- * by Tobias Nygren.
- *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -15,25 +12,17 @@
* 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. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed by the NetBSD
- * Foundation, Inc. and its contributors.
- * 4. Neither the name of The NetBSD Foundation 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
+ * 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.
*/
#include <nbcompat.h>
@@ -45,6 +34,9 @@
#include <stdarg.h>
#endif
+#ifdef MIN
+#undef MIN
+#endif
#define MIN(a, b) ((a)<(b)?(a):(b))
int
@@ -59,14 +51,13 @@
return len;
}
-static FILE *devnull = 0;
-
int
vsnprintf(char *str, size_t size, const char *format, va_list ap)
{
int len;
char buf[129];
char *p = buf;
+ static FILE *devnull = 0;
if (!devnull) {
devnull = fopen("/dev/null", "w");
Home |
Main Index |
Thread Index |
Old Index