OSSP CVS Repository

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

ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c 1.22 -> 1.23

--- lmtp2nntp_msg.c      2002/05/28 12:32:58     1.22
+++ lmtp2nntp_msg.c      2002/05/28 12:43:14     1.23
@@ -975,19 +975,19 @@
                     /* expanding regex references into header name */
                     {
                         char *res_ptr;
-                        logbook(ctx->l2, L2_LEVEL_DEBUG, "expanding regex references in headername '%s'", hrI->header);
-                        if ((var_rc = var_expand(ctx->config_varregex, hrI->header, strlen(hrI->header), &res_ptr, NULL, FALSE)) != VAR_OK) {
-                            logbook(ctx->l2, L2_LEVEL_ERROR, "expansion of '%s' failed: %s", hrI->header, var_strerror(ctx->config_varregex, var_rc, &cp) == VAR_OK ? cp : "Unknown Error", var_rc);
+                        logbook(ctx->l2, L2_LEVEL_DEBUG, "expanding regex references in headername '%s'", hrI->name);
+                        if ((var_rc = var_expand(ctx->config_varregex, hrI->name, strlen(hrI->name), &res_ptr, NULL, FALSE)) != VAR_OK) {
+                            logbook(ctx->l2, L2_LEVEL_ERROR, "expansion of '%s' failed: %s", hrI->name, var_strerror(ctx->config_varregex, var_rc, &cp) == VAR_OK ? cp : "Unknown Error", var_rc);
                         }
                         logbook(ctx->l2, L2_LEVEL_DEBUG, "expansion result '%s'", res_ptr);
                         if (strlen(res_ptr) == 0) {
                             logbook(ctx->l2, L2_LEVEL_DEBUG, "marking deleted - emtpy headername");
-                            hdNew->name = NULL; //FIXME rename ->header to ->name
+                            hdNew->name = NULL;
                             /*FIXME clean up data.s and data.m */
                             hdNew->ndata = 0;
                         }
                         else {
-                            hdNew->name = res_ptr; //FIXME rename ->header to ->name
+                            hdNew->name = res_ptr;
                         }
                     }
                     if (hrI->val == NULL) {
@@ -1034,9 +1034,9 @@
             }
         }
         else {
-            logbook(ctx->l2, L2_LEVEL_DEBUG, "rule has no regex but static header %s", hrI->header);
+            logbook(ctx->l2, L2_LEVEL_DEBUG, "rule has no regex but static header %s", hrI->name);
             hdNew = headercreate();
-            hdNew->name = strdupex(hrI->header); //FIXME rename ->header to ->name
+            hdNew->name = strdupex(hrI->name);
             if (hrI->val == NULL) {
                 logbook(ctx->l2, L2_LEVEL_DEBUG, "marking deleted");
                 /*FIXME clean up data.s and data.m */
@@ -1064,18 +1064,18 @@
             for (hdI = ctx->msg->hdFirst; hdI != NULL; hdI = hdI->next) { /* for each header */
                 if (hdI->name == NULL || strlen(hdI->name) == 0)
                     continue;
-                logbook(ctx->l2, L2_LEVEL_DEBUG, "hrI->header=%s, hdI->name=%s", hrI->header, hdI->name);
-                if (strcasecmp(hrI->header, hdI->name) == 0)
+                logbook(ctx->l2, L2_LEVEL_DEBUG, "hrI->name=%s, hdI->name=%s", hrI->name, hdI->name);
+                if (strcasecmp(hrI->name, hdI->name) == 0)
                     break;
             }
             if (hdI != NULL) {
-                logbook(ctx->l2, L2_LEVEL_DEBUG, "replacing header %s", hrI->header);
+                logbook(ctx->l2, L2_LEVEL_DEBUG, "replacing header %s", hrI->name);
                 headerreplace(hdI, hdNew);
                 if (hdNew->prev == NULL)
                     ctx->msg->hdFirst = hdNew;
             }
             else {
-                logbook(ctx->l2, L2_LEVEL_DEBUG, "appending header %s", hrI->header);
+                logbook(ctx->l2, L2_LEVEL_DEBUG, "appending header %s", hrI->name);
                 for (hdI = ctx->msg->hdFirst; hdI->next != NULL; hdI = hdI->next);
                 hdI->next = hdNew;
                 hdNew->prev = hdI;

CVSTrac 2.0.1