diff options
Diffstat (limited to 'applets')
-rw-r--r-- | applets/applets.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/applets/applets.c b/applets/applets.c index a974743da..8a17cbf0b 100644 --- a/applets/applets.c +++ b/applets/applets.c | |||
@@ -106,7 +106,7 @@ static char *get_trimmed_slice(char *s, char *e) | |||
106 | } | 106 | } |
107 | 107 | ||
108 | 108 | ||
109 | #define parse_error(x) { err=x; goto pe_label; } | 109 | #define parse_error(x) do { errmsg = x; goto pe_label; } while(0) |
110 | 110 | ||
111 | /* Don't depend on the tools to combine strings. */ | 111 | /* Don't depend on the tools to combine strings. */ |
112 | static const char config_file[] = CONFIG_FILE; | 112 | static const char config_file[] = CONFIG_FILE; |
@@ -130,7 +130,7 @@ static void parse_config_file(void) | |||
130 | struct BB_suid_config *sct; | 130 | struct BB_suid_config *sct; |
131 | struct BB_applet *applet; | 131 | struct BB_applet *applet; |
132 | FILE *f; | 132 | FILE *f; |
133 | char *err; | 133 | const char *errmsg; |
134 | char *s; | 134 | char *s; |
135 | char *e; | 135 | char *e; |
136 | int i, lc, section; | 136 | int i, lc, section; |
@@ -307,7 +307,7 @@ static void parse_config_file(void) | |||
307 | 307 | ||
308 | pe_label: | 308 | pe_label: |
309 | fprintf(stderr, "Parse error in %s, line %d: %s\n", | 309 | fprintf(stderr, "Parse error in %s, line %d: %s\n", |
310 | config_file, lc, err); | 310 | config_file, lc, errmsg); |
311 | 311 | ||
312 | fclose(f); | 312 | fclose(f); |
313 | /* Release any allocated memory before returning. */ | 313 | /* Release any allocated memory before returning. */ |