*** ./p11-kit/debug.h.ORIG Tue Aug 9 18:27:14 2011 --- ./p11-kit/debug.h Tue Aug 9 18:27:34 2011 *************** *** 73,79 **** #undef debug #define debug(format, ...) do { \ if (DEBUG_FLAG & debug_current_flags) \ ! debug_message (DEBUG_FLAG, "%s: " format, __PRETTY_FUNCTION__, ##__VA_ARGS__); \ } while (0) #undef debugging --- 73,79 ---- #undef debug #define debug(format, ...) do { \ if (DEBUG_FLAG & debug_current_flags) \ ! debug_message (DEBUG_FLAG, "%s: " format, __FUNCTION__, ##__VA_ARGS__); \ } while (0) #undef debugging *** ./p11-kit/Makefile.in.ORIG Tue Aug 9 19:03:31 2011 --- ./p11-kit/Makefile.in Tue Aug 9 18:32:06 2011 *************** *** 91,97 **** $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libp11_kit_testable_la_LDFLAGS) \ $(LDFLAGS) -o $@ ! libp11_kit_la_LIBADD = am_libp11_kit_la_OBJECTS = $(am__objects_2) libp11_kit_la_OBJECTS = $(am_libp11_kit_la_OBJECTS) libp11_kit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ --- 91,97 ---- $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(libp11_kit_testable_la_LDFLAGS) \ $(LDFLAGS) -o $@ ! libp11_kit_la_LIBADD = -lintl am_libp11_kit_la_OBJECTS = $(am__objects_2) libp11_kit_la_OBJECTS = $(am_libp11_kit_la_OBJECTS) libp11_kit_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ *** ./tools/p11-kit.c.ORIG Tue Aug 9 18:33:09 2011 --- ./tools/p11-kit.c Tue Aug 9 18:46:53 2011 *************** *** 35,41 **** #include "config.h" #include ! #include #include #include #include --- 35,43 ---- #include "config.h" #include ! #include "vwarnx.c" ! #include "warnx.c" ! #include "errx.c" #include #include #include *** ./tools/errx.c.ORIG Tue Aug 9 18:48:28 2011 --- ./tools/errx.c Tue Aug 9 18:48:08 2011 *************** *** 0 **** --- 1,50 ---- + /* $NiH: errx.c,v 1.2 2003/05/11 02:38:58 wiz Exp $ */ + /*- + * Copyright (c) 2003 Thomas Klausner. + * 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. + * 3. The name of the author may not be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THOMAS KLAUSNER ``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. + */ + + + #include + #include + #include + + void + errx(int status, const char *fmt, ...) + { + va_list ap; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); + fputs("\n", stderr); + + exit(status); + } + *** ./tools/warnx.c.ORIG Tue Aug 9 18:48:33 2011 --- ./tools/warnx.c Tue Aug 9 18:44:19 2011 *************** *** 0 **** --- 1,44 ---- + /* $NetBSD: warnx.c,v 1.14 2007/06/18 14:13:54 ginsbach Exp $ */ + + /*- + * Copyright (c) 1993 + * The Regents of the University of California. 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. + * 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 + + void + warnx(const char *fmt, ...) + { + va_list ap; + + va_start(ap, fmt); + vwarnx(fmt, ap); + va_end(ap); + } + *** ./tools/vwarnx.c.ORIG Tue Aug 9 18:48:37 2011 --- ./tools/vwarnx.c Tue Aug 9 18:45:53 2011 *************** *** 0 **** --- 1,54 ---- + /* $NetBSD: vwarnx.c,v 1.3 1997/07/17 21:33:27 thorpej Exp $ */ + + /*- + * Copyright (c) 1993 + * The Regents of the University of California. 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. + * 3. All advertising materials mentioning features or use of this software + * must display the following acknowledgement: + * This product includes software developed by the University of + * California, Berkeley and its contributors. + * 4. 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 + + #ifdef __STDC__ + #include + #else + #include + #endif + + + void + vwarnx(fmt, ap) + const char *fmt; + va_list ap; + { + if (fmt != NULL) + (void)vfprintf(stderr, fmt, ap); + (void)fprintf(stderr, "\n"); + } +