Index: head/usr.sbin/nscd/debug.c =================================================================== --- head/usr.sbin/nscd/debug.c (revision 339918) +++ head/usr.sbin/nscd/debug.c (revision 339919) @@ -1,150 +1,150 @@ /*- * Copyright (c) 2004 Michael Bushkov * 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. * * 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 __FBSDID("$FreeBSD$"); #include #include "debug.h" static int trace_level = 0; static int trace_level_bk = 0; void nscd_trace_in(const char *s, const char *f, int l) { int i; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level; ++i) printf("\t"); printf("=> %s\n", s); } ++trace_level; } void nscd_trace_point(const char *f, int l) { int i; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level - 1; ++i) printf("\t"); printf("= %s: %d\n", f, l); } } void nscd_trace_msg(const char *msg, const char *f, int l) { int i; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level - 1; ++i) printf("\t"); printf("= MSG %s, %s: %d\n", msg, f, l); } } void nscd_trace_ptr(const char *desc, const void *p, const char *f, int l) { int i; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level - 1; ++i) printf("\t"); printf("= PTR %s: %p, %s: %d\n", desc, p, f, l); } } void nscd_trace_int(const char *desc, int i, const char *f, int l) { int j; if (trace_level < TRACE_WANTED) { for (j = 0; j < trace_level - 1; ++j) printf("\t"); printf("= INT %s: %i, %s: %d\n",desc, i, f, l); } } void nscd_trace_str(const char *desc, const char *s, const char *f, int l) { int i; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level - 1; ++i) printf("\t"); printf("= STR %s: '%s', %s: %d\n", desc, s, f, l); } } void nscd_trace_out(const char *s, const char *f, int l) { int i; --trace_level; if (trace_level < TRACE_WANTED) { for (i = 0; i < trace_level; ++i) printf("\t"); - printf("<= %s\n", s); + printf("<= %s, %s: %d\n", s, f, l); } } void nscd_trace_on(void) { trace_level = trace_level_bk; trace_level_bk = 0; } void nscd_trace_off(void) { trace_level_bk = trace_level; trace_level = 1024; } Index: head/usr.sbin/nscd/debug.h =================================================================== --- head/usr.sbin/nscd/debug.h (revision 339918) +++ head/usr.sbin/nscd/debug.h (revision 339919) @@ -1,67 +1,66 @@ /*- * Copyright (c) 2004 Michael Bushkov * 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. * * 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. * * $FreeBSD$ */ #ifndef __NSCD_DEBUG_H__ #define __NSCD_DEBUG_H__ #define TRACE_WANTED 32 -/* #ifndef NDEBUG */ -#if 0 +#ifndef NDEBUG #define TRACE_IN(x) nscd_trace_in(#x, __FILE__, __LINE__) #define TRACE_POINT() nscd_trace_point(__FILE__, __LINE__) #define TRACE_MSG(x) nscd_trace_msg(x, __FILE__, __LINE__) #define TRACE_PTR(p) nscd_trace_ptr(#p, p, __FILE__, __LINE__) #define TRACE_INT(i) nscd_trace_int(#i, i, __FILE__, __LINE__) #define TRACE_STR(s) nscd_trace_str(#s, s, __FILE__, __LINE__) #define TRACE_OUT(x) nscd_trace_out(#x, __FILE__, __LINE__) #define TRACE_ON() nscd_trace_on() #define TRACE_OFF() nscd_trace_off() #else #define TRACE_IN(x) (void)0 #define TRACE_POINT() (void)0 #define TRACE_MSG(x) (void)0 #define TRACE_PTR(p) (void)0 #define TRACE_INT(i) (void)0 #define TRACE_STR(s) (void)0 #define TRACE_OUT(x) (void)0 #define TRACE_ON() (void)0 #define TRACE_OFF() (void)0 #endif void nscd_trace_in(const char *, const char *, int); void nscd_trace_point(const char *, int); void nscd_trace_msg(const char *, const char *, int); void nscd_trace_ptr(const char *, const void *, const char *, int); void nscd_trace_int(const char *, int, const char *, int); void nscd_trace_str(const char *, const char *, const char *, int); void nscd_trace_out(const char *, const char *, int); void nscd_trace_on(void); void nscd_trace_off(void); #endif