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

[nmh] / sbr / readconfig.c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 5d1168939d05cb65ac8dd10483b413c601acf557..1588b53952ff010f97b1ab194ce00ccc4ee15ed9 100644 (file)
--- a/sbr/readconfig.c
+++ b/sbr/readconfig.c
@@ -61,7 +61,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx)
        switch (state = m_getfld (&gstate, name, field, &fieldsz, ib)) {
            case FLD:
            case FLDPLUS:
        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);
                *npp = np;
                *(npp = &np->n_next) = NULL;
                np->n_name = getcpy (name);


@@ -138,7 +138,7 @@ readconfig (struct node **npp, FILE *ib, const 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. */
        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)) {
                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, const char *file, int ctx)
 
 void
 add_profile_entry (const char *key, const char *value) {
 
 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. */
 
     /* 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;
     newnode->n_name = getcpy (key);
     newnode->n_field = getcpy (value);
     newnode->n_context = 0;