Replace NEW() then memset() of 0 with NEW0().

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 30b844a2c927a63619f63988c74d5c9d3d3eb86f..1588b53952ff010f97b1ab194ce00ccc4ee15ed9 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -42,7 +42,7 @@ static struct node **opp = NULL;
 
 
 void
-readconfig (struct node **npp, FILE *ib, char *file, int ctx)
+readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
 {
     register int state;
     register char *cp;
@@ -61,7 +61,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:
-               np = (struct node *) mh_xmalloc (sizeof(*np));
+               NEW(np);
                *npp = np;
                *(npp = &np->n_next) = NULL;
                np->n_name = getcpy (name);
@@ -130,7 +130,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
           mhn.defaults can be overridden without triggering
           warnings.
 
-          Note that that mhn.defaults, $MHN, $MHBUILD, $MHSHOW, and
+          Note that mhn.defaults, $MHN, $MHBUILD, $MHSHOW, and
           $MHSTORE all put their entries into just one list, m_defs,
           the same list that the profile uses. */
 
@@ -138,7 +138,7 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
        for (np = m_defs; np; np = np->n_next) {
            /* Yes, this is O(N^2).  The profile should be small enough so
               that's not a performance problem. */
-           if (strlen (np->n_name) > 0  &&  strcmp ("#", np->n_name)) {
+           if (*np->n_name && strcmp("#", np->n_name)) {
                struct node *np2;
                for (np2 = np->n_next; np2; np2 = np2->n_next) {
                    if (! strcasecmp (np->n_name, np2->n_name)) {
@@ -157,11 +157,12 @@ readconfig (struct node **npp, FILE *ib, char *file, int ctx)
 
 void
 add_profile_entry (const char *key, const char *value) {
-    struct node *newnode = (struct node *) mh_xmalloc (sizeof *newnode);
+    struct node *newnode;
 
     /* This inserts the new node at the beginning of m_defs because
        that doesn't require traversing it or checking to see if it's
        empty. */
+    NEW(newnode);
     newnode->n_name = getcpy (key);
     newnode->n_field = getcpy (value);
     newnode->n_context = 0;