X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Freadconfig.c;h=2fe2d7d3f6082bc610e7241f468c18b0f1f83399;hp=171ecf8a4720c537aeccc9960417b93f5364f6aa;hb=9cf6132a6ea29968131a000bc2fb6860affac45e;hpb=cf1205b5cbea2f0cd6ea710ec16c637df85b647c

diff --git a/sbr/readconfig.c b/sbr/readconfig.c
index 171ecf8..2fe2d7d 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,20 +52,19 @@ 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);
+			np->n_name = mh_xstrdup(name);
 			if (state == FLDPLUS) {
-				cp = getcpy(field);
+				cp = mh_xstrdup(field);
 				while (state == FLDPLUS) {
 					state = m_getfld(state, name, field,
 							sizeof(field), ib);
 					cp = add(field, cp);
 				}
 				np->n_field = trimcpy(cp);
-				free(cp);
+				mh_free0(&cp);
 			} else {
 				np->n_field = trimcpy(field);
 			}
@@ -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);