carl9170: Update to latest upstream

[linux-libre-firmware.git] / carl9170fw / config / preprocess.c

diff --git a/carl9170fw/config/preprocess.c b/carl9170fw/config/preprocess.c
index 592dfbfa9fb30d6804043a5bad23b9f683adefd8..0590f86df6e40cfd073100904f3ec5cfbe650f5f 100644 (file)
--- a/carl9170fw/config/preprocess.c
+++ b/carl9170fw/config/preprocess.c
@@ -15,6 +15,7 @@
 #define ARRAY_SIZE(arr)                (sizeof(arr) / sizeof((arr)[0]))
 
 static char *expand_string_with_args(const char *in, int argc, char *argv[]);
+static char *expand_string(const char *in);
 
 static void __attribute__((noreturn)) pperror(const char *format, ...)
 {
@@ -113,7 +114,7 @@ static char *do_error_if(int argc, char *argv[])
        if (!strcmp(argv[0], "y"))
                pperror("%s", argv[1]);
 
-       return NULL;
+       return xstrdup("");
 }
 
 static char *do_filename(int argc, char *argv[])
@@ -550,7 +551,7 @@ static char *expand_string_with_args(const char *in, int argc, char *argv[])
        return __expand_string(&in, is_end_of_str, argc, argv);
 }
 
-char *expand_string(const char *in)
+static char *expand_string(const char *in)
 {
        return expand_string_with_args(in, 0, NULL);
 }