diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-17 18:04:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-04-17 18:04:38 +0000 |
| commit | e96dcb4dcffc8ade4c4f812ab2ed63287faaec83 (patch) | |
| tree | f228d9a9d39410a9f6f877e133c8de798020edfc | |
| parent | 250aa5bb015061787e62f63847df04f377af91c1 (diff) | |
| download | busybox-w32-e96dcb4dcffc8ade4c4f812ab2ed63287faaec83.tar.gz busybox-w32-e96dcb4dcffc8ade4c4f812ab2ed63287faaec83.tar.bz2 busybox-w32-e96dcb4dcffc8ade4c4f812ab2ed63287faaec83.zip | |
top: fix build failure
| -rw-r--r-- | include/usage.h | 5 | ||||
| -rw-r--r-- | procps/top.c | 7 |
2 files changed, 6 insertions, 6 deletions
diff --git a/include/usage.h b/include/usage.h index 09695ef76..01acda16d 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -97,11 +97,6 @@ | |||
| 97 | "\n -s sender Sender IP address" \ | 97 | "\n -s sender Sender IP address" \ |
| 98 | "\n target Target IP address" \ | 98 | "\n target Target IP address" \ |
| 99 | 99 | ||
| 100 | //#define ash_trivial_usage \ | ||
| 101 | // "[FILE]...\n" \ | ||
| 102 | // "or: ash -c command [args]..." | ||
| 103 | //#define ash_full_usage "\n\n" \ | ||
| 104 | // "The ash shell" | ||
| 105 | #define sh_trivial_usage NOUSAGE_STR | 100 | #define sh_trivial_usage NOUSAGE_STR |
| 106 | #define sh_full_usage "" | 101 | #define sh_full_usage "" |
| 107 | #define ash_trivial_usage NOUSAGE_STR | 102 | #define ash_trivial_usage NOUSAGE_STR |
diff --git a/procps/top.c b/procps/top.c index e3f91c8f9..206f9e8be 100644 --- a/procps/top.c +++ b/procps/top.c | |||
| @@ -861,17 +861,22 @@ int top_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 861 | #else | 861 | #else |
| 862 | qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); | 862 | qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0])); |
| 863 | #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ | 863 | #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */ |
| 864 | } else { /* TOPMEM */ | 864 | } |
| 865 | #if ENABLE_FEATURE_TOPMEM | ||
| 866 | else { /* TOPMEM */ | ||
| 865 | qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); | 867 | qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort); |
| 866 | } | 868 | } |
| 869 | #endif | ||
| 867 | count = lines; | 870 | count = lines; |
| 868 | if (OPT_BATCH_MODE || count > ntop) { | 871 | if (OPT_BATCH_MODE || count > ntop) { |
| 869 | count = ntop; | 872 | count = ntop; |
| 870 | } | 873 | } |
| 871 | if (scan_mask == TOP_MASK) | 874 | if (scan_mask == TOP_MASK) |
| 872 | display_process_list(count, col); | 875 | display_process_list(count, col); |
| 876 | #if ENABLE_FEATURE_TOPMEM | ||
| 873 | else | 877 | else |
| 874 | display_topmem_process_list(count, col); | 878 | display_topmem_process_list(count, col); |
| 879 | #endif | ||
| 875 | clearmems(); | 880 | clearmems(); |
| 876 | if (iterations >= 0 && !--iterations) | 881 | if (iterations >= 0 && !--iterations) |
| 877 | break; | 882 | break; |
