diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 22:51:00 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-01-29 22:51:00 +0000 |
| commit | a41fdf331af344ecd3ec230a072857ea197e1890 (patch) | |
| tree | 70ffff0b7f48b35a70b8b04253abe9118ded6026 /applets | |
| parent | e935602ff5d5a45be56585b8bad44194c3e837a3 (diff) | |
| download | busybox-a41fdf331af344ecd3ec230a072857ea197e1890.tar.gz | |
preparatory patch for -Wwrite-strings #1
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) } -#define parse_error(x) { err=x; goto pe_label; } +#define parse_error(x) do { errmsg = x; goto pe_label; } while(0) /* Don't depend on the tools to combine strings. */ static const char config_file[] = CONFIG_FILE; @@ -130,7 +130,7 @@ static void parse_config_file(void) struct BB_suid_config *sct; struct BB_applet *applet; FILE *f; - char *err; + const char *errmsg; char *s; char *e; int i, lc, section; @@ -307,7 +307,7 @@ static void parse_config_file(void) pe_label: fprintf(stderr, "Parse error in %s, line %d: %s\n", - config_file, lc, err); + config_file, lc, errmsg); fclose(f); /* Release any allocated memory before returning. */ |