X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=config%2Futil.c;h=c6f6e21b809ffe7a6f60acd2a7f016ee88971d5c;hb=a5d5b673abfd2afc6c1f80d8e10aad63c3d265cd;hp=0e76042473ccd3633aa0870da3cce23e0b1788c6;hpb=07e4b780c277720017c452506789282bdb62b8c7;p=carl9170fw.git diff --git a/config/util.c b/config/util.c index 0e76042..c6f6e21 100644 --- a/config/util.c +++ b/config/util.c @@ -14,11 +14,11 @@ struct file *file_lookup(const char *name) { struct file *file; - const char *file_name = sym_expand_string_value(name); + char *file_name = sym_expand_string_value(name); for (file = file_list; file; file = file->next) { if (!strcmp(name, file->name)) { - free((void *)file_name); + free(file_name); return file; } } @@ -104,7 +104,7 @@ void str_append(struct gstr *gs, const char *s) if (s) { l = strlen(gs->s) + strlen(s) + 1; if (l > gs->len) { - gs->s = realloc(gs->s, l); + gs->s = xrealloc(gs->s, l); gs->len = l; } strcat(gs->s, s); @@ -145,3 +145,23 @@ void *xcalloc(size_t nmemb, size_t size) fprintf(stderr, "Out of memory.\n"); exit(1); } + +void *xrealloc(void *p, size_t size) +{ + p = realloc(p, size); + if (p) + return p; + fprintf(stderr, "Out of memory.\n"); + exit(1); +} + +char *xstrdup(const char *s) +{ + char *p; + + p = strdup(s); + if (p) + return p; + fprintf(stderr, "Out of memory.\n"); + exit(1); +}