fmt_rfc2047.c: Tables hexindex[] and index_64[] can be const.

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index 6173be33438385f025796c5f6b6a725529493f90..389e16c491d62460dfa602e0e094e88b223e8bf9 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -559,7 +559,7 @@ do_name(char *sp, int preprocess)
            CERROR("component used as both date and address");
        }
        if (cm->c_tws) {
            CERROR("component used as both date and address");
        }
        if (cm->c_tws) {

-           memset (cm->c_tws, 0, sizeof *cm->c_tws);
+           ZERO(cm->c_tws);

        } else {
            NEW0(cm->c_tws);
        }
        } else {
            NEW0(cm->c_tws);
        }


@@ -965,7 +965,7 @@ fmt_freecomptext(void)
     unsigned int i;
     struct comp *cm;
 
     unsigned int i;
     struct comp *cm;
 

-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++)
+    for (i = 0; i < DIM(wantcomp); i++)

         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
             mh_xfree(cm->c_text);
             cm->c_text = NULL;
         for (cm = wantcomp[i]; cm; cm = cm->c_next) {
             mh_xfree(cm->c_text);
             cm->c_text = NULL;


@@ -1101,7 +1101,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket)
     else
        comp = comp->c_next;
 
     else
        comp = comp->c_next;
 

-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {

        comp = wantcomp[(*bucket)++];
     }
 
        comp = wantcomp[(*bucket)++];
     }
 


@@ -1118,7 +1118,7 @@ free_comptable(void)
     unsigned int i;
     struct comp *cm, *cm2;
 
     unsigned int i;
     struct comp *cm, *cm2;
 

-    for (i = 0; i < sizeof(wantcomp)/sizeof(wantcomp[0]); i++) {
+    for (i = 0; i < DIM(wantcomp); i++) {

        cm = wantcomp[i];
        while (cm != NULL) {
            cm2 = cm->c_next;
        cm = wantcomp[i];
        while (cm != NULL) {
            cm2 = cm->c_next;