m_getfld.c: Remove Ungetc()'s `c' parameter.

[nmh] / sbr / fmt_compile.c

diff --git a/sbr/fmt_compile.c b/sbr/fmt_compile.c
index b0ce64626b7a1a7fd721a05d4096ffe03b98ec3e..5a4e4b8b062cdb6423bbca272cb4c943696be60b 100644 (file)
--- a/sbr/fmt_compile.c
+++ b/sbr/fmt_compile.c
@@ -296,9 +296,8 @@ static struct colormap colortable[] = {
        wantcomp[i] = cm; \
        } while (0)
 
-#define NEWFMT (next_fp++)
 #define NEW_FP(type,fill,wid) do {\
-       fp=NEWFMT; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
+       fp=next_fp++; fp->f_type=(type); fp->f_fill=(fill); fp->f_width=(wid); \
        } while (0)
 
 /* Add (possibly new) component to the hash table */
@@ -966,7 +965,7 @@ fmt_freecomptext(void)
     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;
@@ -1102,7 +1101,7 @@ fmt_nextcomp(struct comp *comp, unsigned int *bucket)
     else
        comp = comp->c_next;
 
-    while (comp == NULL && *bucket < sizeof(wantcomp)/sizeof(wantcomp[0])) {
+    while (comp == NULL && *bucket < DIM(wantcomp)) {
        comp = wantcomp[(*bucket)++];
     }
 
@@ -1119,7 +1118,7 @@ free_comptable(void)
     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;