kconfig: remove const qualifier from sym_expand_string_value()

[carl9170fw.git] / config / util.c

diff --git a/config/util.c b/config/util.c
index 0e76042473ccd3633aa0870da3cce23e0b1788c6..b98a79e30e04a4017bd33264e85b2c40e46bc3af 100644 (file)
--- 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,12 @@ 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);
+}