OSSP CVS Repository

Check-in Number:	3233
Date:	2003-Feb-12 13:27:01 (local) 2003-Feb-12 12:27:01 (UTC)
User:	rse
Branch:
Comment:	fix iteration logic
Tickets:
Inspections:
Files:	ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c      1.38 -> 1.39     15 inserted, 15 deleted

---

ossp-pkg/lmtp2nntp/lmtp2nntp_msg.c 1.38 -> 1.39

--- lmtp2nntp_msg.c 2003/02/11 15:03:18 1.38 +++ lmtp2nntp_msg.c 2003/02/12 12:27:01 1.39 @@ -727,22 +727,22 @@ hdI = msg->hdFirst; /* for each header */ while (hdI != NULL) { logbook(msg->l2, L2_LEVEL_DEBUG, "processing matrix header \"%s\"", hdI->name); - if (hdI->name == NULL || strlen(hdI->name) == 0 || hdI->ndata == 0) - continue; - if (hdI->ndata == 0) { - logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s, no data", hdI->name); - } - else if(hdI->ndata == 1) { /* header data is single valued */ - logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s, data=%s", hdI->name, hdI->data.s); - argz_add(&msg->azHeaders, &msg->asHeaders, hdI->name); - argz_add(&msg->azHeaders, &msg->asHeaders, hdI->data.s); - } - else { /* header data is multi valued */ - int i; - for (i = 0; i < hdI->ndata; i++) { - logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s[%d], data=%s", hdI->name, i, hdI->data.m[i]); + if (hdI->name != NULL && strlen(hdI->name) != 0 && hdI->ndata != 0) { + if (hdI->ndata == 0) { + logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s, no data", hdI->name); + } + else if(hdI->ndata == 1) { /* header data is single valued */ + logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s, data=%s", hdI->name, hdI->data.s); argz_add(&msg->azHeaders, &msg->asHeaders, hdI->name); - argz_add(&msg->azHeaders, &msg->asHeaders, hdI->data.m[i]); + argz_add(&msg->azHeaders, &msg->asHeaders, hdI->data.s); + } + else { /* header data is multi valued */ + int i; + for (i = 0; i < hdI->ndata; i++) { + logbook(msg->l2, L2_LEVEL_DEBUG, "header=%s[%d], data=%s", hdI->name, i, hdI->data.m[i]); + argz_add(&msg->azHeaders, &msg->asHeaders, hdI->name); + argz_add(&msg->azHeaders, &msg->asHeaders, hdI->data.m[i]); + } } } /* cleanup */