X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c6f2d14d9c38345075629af3487c2de491584ca1..39a9d9d85d0f2289d8c1257251311b7cf959c700:/sbr/readconfig.c diff --git a/sbr/readconfig.c b/sbr/readconfig.c index 1fe9d036..b92f699b 100644 --- a/sbr/readconfig.c +++ b/sbr/readconfig.c @@ -52,7 +52,7 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx) m_getfld_state_t gstate = 0; if (npp == NULL && (npp = opp) == NULL) { - admonish (NULL, "bug: readconfig called but pump not primed"); + inform("bug: readconfig called but pump not primed, continuing..."); return; } @@ -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); @@ -142,9 +142,9 @@ readconfig (struct node **npp, FILE *ib, const char *file, int ctx) struct node *np2; for (np2 = np->n_next; np2; np2 = np2->n_next) { if (! strcasecmp (np->n_name, np2->n_name)) { - admonish (NULL, "multiple \"%s\" profile components " - "in %s, ignoring \"%s\"", - np->n_name, defpath, np2->n_field); + inform("multiple \"%s\" profile components in %s, " + "ignoring \"%s\", continuing...", + np->n_name, defpath, np2->n_field); } } }