X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/2d5d9e243c91784909b11948894e3ba0989107c0..9322ba2854211794c27fae9468768b80b767c211:/sbr/readconfig.c diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 70984022..5b72113c 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -44,11 +44,11 @@ static struct node **opp = NULL; void readconfig (struct node **npp, FILE *ib, const char *file, int ctx) { - register int state; - register char *cp; + int state; + char *cp; char name[NAMESZ], field[BUFSIZ]; - register struct node *np; - register struct procstr *ps; + struct node *np; + struct procstr *ps; m_getfld_state_t gstate = 0; if (npp == NULL && (npp = opp) == NULL) { @@ -64,9 +64,9 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx) NEW(np); *npp = np; *(npp = &np->n_next) = NULL; - np->n_name = getcpy (name); + np->n_name = mh_xstrdup(name); if (state == FLDPLUS) { - cp = getcpy (field); + cp = mh_xstrdup(field); while (state == FLDPLUS) { fieldsz = sizeof field; state = m_getfld (&gstate, name, field, &fieldsz, ib); @@ -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. */ - 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)) {