OSSP CVS Repository

ossp - Difference in ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c versions 1.18 and 1.19
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [History

ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c 1.18 -> 1.19

--- lmtp2nntp_msg.c      2002/05/28 11:29:00     1.18
+++ lmtp2nntp_msg.c      2002/05/28 12:19:47     1.19
@@ -900,12 +900,13 @@
     if (ctx->option_firstheaderrule == NULL)
         return;
 
-    { //FIXME debug code block
+#if 0
+    { //TODO debug only - wait for l2 to support code block bypassing
         int i;
         headerrule_t *hrD;
         headerdata_t *hdD;
 
-        logbook(ctx->l2, L2_LEVEL_DEBUG, "FIXME trace ---------- headerrewrite() ----------");
+        logbook(ctx->l2, L2_LEVEL_DEBUG, "headerrewrite input");
         for (hrD = ctx->option_firstheaderrule; hrD != NULL; hrD = hrD->next)
             logbook(ctx->l2, L2_LEVEL_DEBUG, "hrD->header=%s", hrD->header);
         for (hdD = ctx->msg->hdFirst; hdD != NULL; hdD = hdD->next) {
@@ -918,6 +919,7 @@
                     logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD->name:hdD->data.m[%d] %s %s", i, hdD->name, hdD->data.m[i]);
         }
     }
+#endif
     
     regex_ctx = (regex_ctx_t *)mallocex(sizeof(regex_ctx_t));
     regex_ctx->nMatch = 0;
@@ -933,12 +935,13 @@
         throw(0,0,0);
     }
     for (hrI = ctx->option_firstheaderrule; hrI != NULL; hrI = hrI->next) { /* for each rule */
-        { //FIXME debug code block
+#if 0
+        { //TODO debug only - wait for l2 to support code block bypassing
             int i;
             headerrule_t *hrD;
             headerdata_t *hdD;
 
-            logbook(ctx->l2, L2_LEVEL_DEBUG, "FIXME trace ---------- headerrewrite() ---------- MIDDLE");
+            logbook(ctx->l2, L2_LEVEL_DEBUG, "headerrewrite loop for each rule");
             for (hrD = ctx->option_firstheaderrule; hrD != NULL; hrD = hrD->next)
                 logbook(ctx->l2, L2_LEVEL_DEBUG, "hrD->header=%s", hrD->header);
             for (hdD = ctx->msg->hdFirst; hdD != NULL; hdD = hdD->next) {
@@ -952,6 +955,7 @@
                         logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD->name:hdD->data.m[%d] %s %s", i, hdD->name, hdD->data.m[i]);
             }
         }
+#endif
         if (hrI->regex != NULL) {
             logbook(ctx->l2, L2_LEVEL_DEBUG, "rule has regex %s", hrI->regex);
             for (hdI = ctx->msg->hdFirst; hdI != NULL; hdI = hdI->next) { /* for each header */
@@ -1070,10 +1074,8 @@
             if (hdI != NULL) {
                 logbook(ctx->l2, L2_LEVEL_DEBUG, "replacing header %s", hrI->header);
                 headerreplace(hdI, hdNew);
-                if (hdNew->prev == NULL) {
-                    logbook(ctx->l2, L2_LEVEL_DEBUG, "FIXME trace #1");
+                if (hdNew->prev == NULL)
                     ctx->msg->hdFirst = hdNew;
-                }
             }
             else {
                 logbook(ctx->l2, L2_LEVEL_DEBUG, "appending header %s", hrI->header);
@@ -1084,12 +1086,13 @@
         }
     }
 
-    { //FIXME debug code block
+#if 0
+    { //TODO debug only - wait for l2 to support code block bypassing
         int i;
         headerrule_t *hrD;
         headerdata_t *hdD;
 
-        logbook(ctx->l2, L2_LEVEL_DEBUG, "FIXME trace ---------- headerrewrite() ---------- FINISH");
+        logbook(ctx->l2, L2_LEVEL_DEBUG, "headerrewrite output");
         for (hrD = ctx->option_firstheaderrule; hrD != NULL; hrD = hrD->next)
             logbook(ctx->l2, L2_LEVEL_DEBUG, "hrD->header=%s", hrD->header);
         for (hdD = ctx->msg->hdFirst; hdD != NULL; hdD = hdD->next) {
@@ -1102,4 +1105,5 @@
                     logbook(ctx->l2, L2_LEVEL_DEBUG, "hdD->name:hdD->data.m[%d] %s %s", i, hdD->name, hdD->data.m[i]);
         }
     }
+#endif
 }

CVSTrac 2.0.1