emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove redundant ENABLE_DESKTOP in procps/ps.c

Browse Source 
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
This commit is contained in:
Cristian Ionescu-Idbohrn 2010-09-05 14:34:42 +02:00 committed by Denys Vlasenko
parent b36abf2dfc
commit 6957d79bd6
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
procps/ps.c
View File

@ -338,24 +338,16 @@ static ps_out_t* new_out_t(void)
static const ps_out_t* find_out_spec(const char *name) static const ps_out_t* find_out_spec(const char *name)
{ {
unsigned i; unsigned i;
#if ENABLE_DESKTOP
char buf[ARRAY_SIZE(out_spec)*7 + 1]; char buf[ARRAY_SIZE(out_spec)*7 + 1];
char *p = buf; char *p = buf;
#endif
for (i = 0; i < ARRAY_SIZE(out_spec); i++) { for (i = 0; i < ARRAY_SIZE(out_spec); i++) {
if (strncmp(name, out_spec[i].name6, 6) == 0) if (strncmp(name, out_spec[i].name6, 6) == 0)
return &out_spec[i]; return &out_spec[i];
#if ENABLE_DESKTOP
p += sprintf(p, "%.6s,", out_spec[i].name6); p += sprintf(p, "%.6s,", out_spec[i].name6);
#endif
} }
#if ENABLE_DESKTOP
p[-1] = '\0'; p[-1] = '\0';
bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf); bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf);
#else
bb_error_msg_and_die("bad -o argument '%s'");
#endif
} }
static void parse_o(char* opt) static void parse_o(char* opt)