From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 1 Jun 2004 15:22:58 +0000 (+0000)
Subject: One more RSET_DEBUG
X-Git-Tag: ZEBRA.1.3.16~87
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=152a0ee011a478b0ee8c3ba4045bdd707e702d0b

One more RSET_DEBUG
---

diff --git a/rset/rsbool.c b/rset/rsbool.c
index 22260b4..b14cc37 100644
--- a/rset/rsbool.c
+++ b/rset/rsbool.c
@@ -1,4 +1,4 @@
-/* $Id: rsbool.c,v 1.26 2004-05-30 18:09:31 adam Exp $
+/* $Id: rsbool.c,v 1.27 2004-06-01 15:22:58 adam Exp $
    Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
@@ -20,8 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-#define RSET_DEBUG 0
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -33,6 +31,10 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 /* for key_logdump. Debugging only */
 #include <../index/index.h> 
 
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
+
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
 static void r_close (RSFD rfd);
diff --git a/rset/rsisamb.c b/rset/rsisamb.c
index c9579be..2d732af 100644
--- a/rset/rsisamb.c
+++ b/rset/rsisamb.c
@@ -1,5 +1,5 @@
-/* $Id: rsisamb.c,v 1.7 2004-06-01 14:51:00 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: rsisamb.c,v 1.8 2004-06-01 15:22:58 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,9 +20,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
-
 #include <stdio.h>
 #include <assert.h>
 #include <zebrautl.h>
@@ -30,6 +27,9 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include <string.h>
 #include <../index/index.h> /* for log_keydump. Debugging only */
 
+#ifndef RSET_DEBUG
+#define RSET_DEBUG 0
+#endif
 
 static void *r_create(RSET ct, const struct rset_control *sel, void *parms);
 static RSFD r_open (RSET ct, int flag);
@@ -158,13 +158,17 @@ static int r_forward(RSET ct, RSFD rfd, void *buf, int *term_index,
 {
     int i; /*!*/
     struct rset_pp_info *pinfo = (struct rset_pp_info *) rfd;
+#if RSET_DEBUG
     logf (LOG_DEBUG, "rset_rsisamb_forward starting '%s' (ct=%p rfd=%p)",
                       ct->control->desc, ct,rfd);
     key_logdump(LOG_DEBUG, untilbuf);
     key_logdump(LOG_DEBUG, buf);
+#endif
 
     i=isamb_pp_forward(pinfo->pt, buf, untilbuf);
+#if RSET_DEBUG
     logf (LOG_DEBUG, "rset_rsisamb_forward returning %d",i);
+#endif
     return i;
 }