X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=sbr%2Futils.c;h=5c5b0f5149a01dfd19cf1044e9b799acbb0b26b9;hp=1cd3dc93f6a1879a3ed9ca7b5b66b51d51c6154e;hb=dfa0332c4e6144699dedd5c9795219adc0f9c0d2;hpb=d39e2c447b0d163a5a63f480b23d06edb7a73aa0 diff --git a/sbr/utils.c b/sbr/utils.c index 1cd3dc9..5c5b0f5 100644 --- a/sbr/utils.c +++ b/sbr/utils.c @@ -45,11 +45,12 @@ mh_xrealloc(void *ptr, size_t size) void *memory; /* Some non-POSIX realloc()s don't cope with realloc(NULL,sz) */ - if (!ptr) + if (!ptr) { return mh_xmalloc(size); + } if (size == 0) - adios(NULL, "Tried to realloc 0bytes"); + adios(NULL, "Tried to realloc 0 bytes"); memory = realloc(ptr, size); if (!memory) @@ -215,19 +216,3 @@ app_msgarg(struct msgs_array *msgs, char *cp) (msgs->max+=MAXMSGS)*sizeof(*msgs->msgs)); msgs->msgs[msgs->size++] = cp; } - -/* Open a form or components file */ -int -open_form(char **form, char *def) -{ - int in; - if (*form) { - if ((in = open(etcpath(*form), O_RDONLY)) == NOTOK) - adios(*form, "unable to open form file"); - } else { - if ((in = open(etcpath(def), O_RDONLY)) == NOTOK) - adios(def, "unable to open default components file"); - *form = def; - } - return in; -}