diff options
| author | Cristian Ionescu-Idbohrn <cristian.ionescu-idbohrn@axis.com> | 2010-09-05 14:34:42 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2010-09-05 15:49:37 +0200 |
| commit | 6957d79bd67efce80f9dec4e1936ea605efb7263 (patch) | |
| tree | f426ac0316c9edcdc2a02da775083ed36cfccb5b | |
| parent | b36abf2dfcb47cc0ca659c916b3efef9f757ea0c (diff) | |
| download | busybox-w32-6957d79bd67efce80f9dec4e1936ea605efb7263.tar.gz busybox-w32-6957d79bd67efce80f9dec4e1936ea605efb7263.tar.bz2 busybox-w32-6957d79bd67efce80f9dec4e1936ea605efb7263.zip | |
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>
| -rw-r--r-- | procps/ps.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/procps/ps.c b/procps/ps.c index 305381eb9..48b55a785 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -338,24 +338,16 @@ static ps_out_t* new_out_t(void) | |||
| 338 | static const ps_out_t* find_out_spec(const char *name) | 338 | static const ps_out_t* find_out_spec(const char *name) |
| 339 | { | 339 | { |
| 340 | unsigned i; | 340 | unsigned i; |
| 341 | #if ENABLE_DESKTOP | ||
| 342 | char buf[ARRAY_SIZE(out_spec)*7 + 1]; | 341 | char buf[ARRAY_SIZE(out_spec)*7 + 1]; |
| 343 | char *p = buf; | 342 | char *p = buf; |
| 344 | #endif | ||
| 345 | 343 | ||
| 346 | for (i = 0; i < ARRAY_SIZE(out_spec); i++) { | 344 | for (i = 0; i < ARRAY_SIZE(out_spec); i++) { |
| 347 | if (strncmp(name, out_spec[i].name6, 6) == 0) | 345 | if (strncmp(name, out_spec[i].name6, 6) == 0) |
| 348 | return &out_spec[i]; | 346 | return &out_spec[i]; |
| 349 | #if ENABLE_DESKTOP | ||
| 350 | p += sprintf(p, "%.6s,", out_spec[i].name6); | 347 | p += sprintf(p, "%.6s,", out_spec[i].name6); |
| 351 | #endif | ||
| 352 | } | 348 | } |
| 353 | #if ENABLE_DESKTOP | ||
| 354 | p[-1] = '\0'; | 349 | p[-1] = '\0'; |
| 355 | bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf); | 350 | bb_error_msg_and_die("bad -o argument '%s', supported arguments: %s", name, buf); |
| 356 | #else | ||
| 357 | bb_error_msg_and_die("bad -o argument '%s'"); | ||
| 358 | #endif | ||
| 359 | } | 351 | } |
| 360 | 352 | ||
| 361 | static void parse_o(char* opt) | 353 | static void parse_o(char* opt) |
