X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=config%2Fpreprocess.c;h=0590f86df6e40cfd073100904f3ec5cfbe650f5f;hb=HEAD;hp=592dfbfa9fb30d6804043a5bad23b9f683adefd8;hpb=4d01b0b43ea5208f5722b35246d43c0bbd1b3c7e;p=carl9170fw.git

diff --git a/config/preprocess.c b/config/preprocess.c
index 592dfbf..0590f86 100644
--- a/config/preprocess.c
+++ b/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);
 }