X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Freadconfig.c;h=c99b7cd1bce4414d0b610f8f162c382972c4adcc;hp=171ecf8a4720c537aeccc9960417b93f5364f6aa;hb=b78007de9802005825390bee71dfce2306b42519;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 171ecf8..c99b7cd 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -36,11 +36,11 @@ static struct node **opp = NULL; void readconfig(struct node **npp, FILE *ib, 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; if (npp == NULL && (npp = opp) == NULL) { admonish(NULL, "bug: readconfig called but pump not primed"); @@ -52,8 +52,7 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx) ib)) { case FLD: case FLDPLUS: - case FLDEOF: - np = (struct node *) mh_xmalloc(sizeof(*np)); + np = mh_xcalloc(1, sizeof(*np)); *npp = np; *(npp = &np->n_next) = NULL; np->n_name = getcpy(name); @@ -81,12 +80,9 @@ readconfig(struct node **npp, FILE *ib, char *file, int ctx) *ps->procnaddr = np->n_field; break; } - if (state == FLDEOF) - break; continue; case BODY: - case BODYEOF: adios(EX_CONFIG, NULL, "no blank lines are permitted in %s", file);