summaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorCristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com>2010-09-05 12:34:42 (GMT)
committerDenys Vlasenko <dvlasenk@redhat.com>2010-09-05 13:49:37 (GMT)
commit6957d79bd67efce80f9dec4e1936ea605efb7263 (patch)
treef426ac0316c9edcdc2a02da775083ed36cfccb5b /procps
parentb36abf2dfcb47cc0ca659c916b3efef9f757ea0c (diff)
downloadbusybox-6957d79bd67efce80f9dec4e1936ea605efb7263.tar.gz
busybox-6957d79bd67efce80f9dec4e1936ea605efb7263.tar.bz2
remove redundant ENABLE_DESKTOP in procps/ps.c
Signed-off-by: Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'procps')
-rw-r--r--procps/ps.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/procps/ps.c b/procps/ps.c
index 305381e..48b55a7 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -338,24 +338,16 @@ static ps_out_t* new_out_t(void)
static const ps_out_t* find_out_spec(const char *name)
{
unsigned i;
-#if ENABLE_DESKTOP
char buf[ARRAY_SIZE(out_spec)*7 + 1];
char *p = buf;
-#endif
for (i = 0; i < ARRAY_SIZE(out_spec); i++) {
if (strncmp(name, out_spec[i].name6, 6) == 0)
return &out_spec[i];
-#if ENABLE_DESKTOP
p += sprintf(p, "%.6s,", out_spec[i].name6);
-#endif
}
-#if ENABLE_DESKTOP
p[-1] = '\0';
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)