OSSP CVS Repository

ossp - Check-in [2315]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 2315
Date: 2002-Jul-18 16:07:33 (local)
2002-Jul-18 14:07:33 (UTC)
User:rse
Branch:
Comment: disable debug messages for now
Tickets:
Inspections:
Files:
ossp-pkg/fsl/fsl.c      1.11 -> 1.12     14 inserted, 12 deleted

ossp-pkg/fsl/fsl.c 1.11 -> 1.12

--- fsl.c        2002/07/18 11:26:59     1.11
+++ fsl.c        2002/07/18 14:07:33     1.12
@@ -164,7 +164,7 @@
     char *cp;
     int cfgchilds;
 
-    fprintf(stderr, "DEBUG: diving\n");
+    /*fprintf(stderr, "DEBUG: diving\n");*/
     while (cfgnode != NULL) {
         if ((cfgrv = cfg_node_get(cfg, cfgnode, CFG_NODE_ATTR_TOKEN, &cp)) != CFG_OK) {
             (void)cfg_error(cfg, cfgrv, &cp); fprintf(stderr, "Error: cfg_node_get(CFG_NODE_ATTR_TOKEN) failed with error %s (%d)\n", cp, cfgrv); CU(1); }
@@ -172,7 +172,7 @@
             (void)cfg_error(cfg, cfgrv, &cp); fprintf(stderr, "Error: cfg_node_get(CFG_NODE_ATTR_TYPE) failed with error %s (%d)\n", cp, cfgrv); CU(1); }
         if ((cfgrv = cfg_node_get(cfg, cfgnode, CFG_NODE_ATTR_CHILDS, &cfgchilds)) != CFG_OK) {
             (void)cfg_error(cfg, cfgrv, &cp); fprintf(stderr, "Error: cfg_node_get(CFG_NODE_ATTR_CHILDS) failed with error %s (%d)\n", cp, cfgrv); CU(1); }
-        fprintf(stderr, "DEBUG: cfgnode=0x%.8lx[%d], *cp=\"%s\", type=%d\n", (unsigned long)cfgnode, cfgchilds, cp, cfgtyp);
+        /*fprintf(stderr, "DEBUG: cfgnode=0x%.8lx[%d], *cp=\"%s\", type=%d\n", (unsigned long)cfgnode, cfgchilds, cp, cfgtyp);*/
         if ((cfgrv = cfg_node_get(cfg, cfgnode, CFG_NODE_ATTR_CHILD1, &cfgchld)) != CFG_OK) {
             (void)cfg_error(cfg, cfgrv, &cp); fprintf(stderr, "Error: cfg_node_get(CFG_NODE_ATTR_CHILD1) failed with error %s (%d)\n", cp, cfgrv); CU(1); }
         if (cfgchld != NULL)
@@ -180,7 +180,7 @@
         if ((cfgrv = cfg_node_get(cfg, cfgnode, CFG_NODE_ATTR_RBROTH, &cfgnode)) != CFG_OK) {
             (void)cfg_error(cfg, cfgrv, &cp); fprintf(stderr, "Error: cfg_node_get(CFG_NODE_ATTR_RBROTH) failed with error %s (%d)\n", cp, cfgrv); CU(1); }
     }
-    fprintf(stderr, "DEBUG: climbing\n");
+    /*fprintf(stderr, "DEBUG: climbing\n");*/
     CU(0);
 CUS:
     return;
@@ -307,7 +307,7 @@
     for (i = 0; sysloglevel2string[i].string != NULL; i++) {
         ctx.levelmap[i].syslog = sysloglevel2string[i].level;
         ctx.levelmap[i].l2     = sysloglevel2string[i].deflevelmap;
-        fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);
+        /*fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);*/
     }
 
     /* create L2 environment */
@@ -432,7 +432,7 @@
             argl2spec = cfgargtoka[2];
 
             /*  process the directive using the three arguments found */
-            fprintf(stderr, "DEBUG: argident=%s, argmatch=%s, argl2spec=%s\n", argident, argmatch, argl2spec);
+            /*fprintf(stderr, "DEBUG: argident=%s, argmatch=%s, argl2spec=%s\n", argident, argmatch, argl2spec);*/
             {
                 pcre       *pcreRegex;
                 pcre_extra *pcreExtra;
@@ -448,19 +448,21 @@
                     fprintf(stderr, "Error: pcre_study() failed with error %s\n", cpError); CU(1); }
 
                 nMatch = pcre_exec(pcreRegex, pcreExtra, cpISF, strlen(cpISF), 0, 0, ovec, OVECSIZE);
-                fprintf(stderr, "DEBUG: nMatch=%d when \"%s\" is used against \"%s\"\n", nMatch, argmatch, cpISF);
+                /*fprintf(stderr, "DEBUG: nMatch=%d when \"%s\" is used against \"%s\"\n", nMatch, argmatch, cpISF);*/
                 if (nMatch >= 1) {
                     pcre_get_substring_list(cpISF, ovec, nMatch, &acpMatch);
+                    /*
                     if (acpMatch != NULL)
                         for (i = 0; i < nMatch; i++)
                             fprintf(stderr, "DEBUG: regex reference[%d]=\'%s\'\n", i, acpMatch[i] == NULL ? "(UNDEFINED)" : acpMatch[i]);
+                    */
                     n = substcapture(argl2spec, strlen(argl2spec), acpMatch, nMatch, NULL);
                     if ((cp = (char *)malloc(n + 1)) == NULL) {
                         fprintf(stderr, "Error: malloc() failed\n"); CU(1); }
                     if (substcapture(argl2spec, strlen(argl2spec), acpMatch, nMatch, cp) != n) {
                         fprintf(stderr, "Error: substcapture() failed\n"); CU(1); }
                     argl2spec = cp;
-            fprintf(stderr, "DEBUG: argident=%s, argmatch=%s, argl2spec=%s\n", argident, argmatch, argl2spec);
+            /*fprintf(stderr, "DEBUG: argident=%s, argmatch=%s, argl2spec=%s\n", argident, argmatch, argl2spec);*/
 
                     /* create L2 channel throuh spec and link into root channel */
                     if ((l2rv = l2_spec(&ch, ctx.l2_env, argl2spec)) != L2_OK) {
@@ -481,7 +483,7 @@
                     if ((l2rv = l2_util_s2l(cfgargtoka[2], strlen(cfgargtoka[2]), ',', &levelmask)) != L2_OK) {;
                         cp = l2_env_strerror(ctx.l2_env, l2rv); fprintf(stderr, "Error: illegal l2 mask \"%s\" %s(%d)\n", cfgargtoka[2], cp, l2rv); CU(1); }
                     ctx.levelmap[i].l2 = levelmask;
-                    fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);
+                    /*fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);*/
                     break;
                 }
             }
@@ -515,7 +517,7 @@
         free(buf.base);
     if (rc != 0)
         exit(rc);
-    fprintf(stderr, "DEBUG: ------------------------------------------------------------\n");
+    /*fprintf(stderr, "DEBUG: ------------------------------------------------------------\n");*/
     return;
 }
 
@@ -571,11 +573,11 @@
 
     levelmask = 0;
     for (i = 0; sysloglevel2string[i].string != NULL; i++) {
-    fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);
+    /*fprintf(stderr, "DEBUG: ctx.levelmap[%d].syslog = 0x%.8lx, ctx.levelmap[%d].l2 = 0x%.8lx\n", i, (unsigned long)ctx.levelmap[i].syslog, i, (unsigned long)ctx.levelmap[i].l2);*/
         if (ctx.levelmap[i].syslog == priority)
             levelmask |= ctx.levelmap[i].l2;
     }
-    fprintf(stderr, "DEBUG: prioriy=0x%.8lx > levelmask=0x%.8lx\n", (unsigned long)priority, (unsigned long)levelmask);
+    /*fprintf(stderr, "DEBUG: prioriy=0x%.8lx > levelmask=0x%.8lx\n", (unsigned long)priority, (unsigned long)levelmask);*/
     l2_channel_vlog(ctx.l2_nch, levelmask, fmt, args);
     return;
 }
@@ -666,7 +668,7 @@
 
     if (filename == NULL || buffer == NULL)
         CU(FSL_ERR_ARG);
-fprintf(stderr, "DEBUG: appendfiletobuffer(..., %s)\n", filename);
+/*fprintf(stderr, "DEBUG: appendfiletobuffer(..., %s)\n", filename);*/
 
     if ((fd = open(filename, O_RDONLY)) == -1)
         CU(FSL_ERR_SYS);

CVSTrac 2.0.1