diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-16 20:00:24 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2011-01-16 20:00:24 +0100 |
commit | 12d97b66805f87e535962963e858fc2422ffdbc7 (patch) | |
tree | 10836c6158a05a505d8a7cb83313cc908e837a50 /libbb | |
parent | 2a1571bfa003233470140a17be4ae4f0239f5a24 (diff) | |
download | busybox-w32-1_18_2.tar.gz busybox-w32-1_18_2.tar.bz2 busybox-w32-1_18_2.zip |
apply post-1.18.1 patches, bump version to 1.18.21_18_2
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/procps.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index 792466048..33932a3a3 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
@@ -154,6 +154,7 @@ static unsigned long fast_strtoul_10(char **endptr) | |||
154 | return n; | 154 | return n; |
155 | } | 155 | } |
156 | 156 | ||
157 | # if ENABLE_FEATURE_FAST_TOP | ||
157 | static long fast_strtol_10(char **endptr) | 158 | static long fast_strtol_10(char **endptr) |
158 | { | 159 | { |
159 | if (**endptr != '-') | 160 | if (**endptr != '-') |
@@ -162,6 +163,7 @@ static long fast_strtol_10(char **endptr) | |||
162 | (*endptr)++; | 163 | (*endptr)++; |
163 | return - (long)fast_strtoul_10(endptr); | 164 | return - (long)fast_strtoul_10(endptr); |
164 | } | 165 | } |
166 | # endif | ||
165 | 167 | ||
166 | static char *skip_fields(char *str, int count) | 168 | static char *skip_fields(char *str, int count) |
167 | { | 169 | { |
@@ -448,7 +450,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags) | |||
448 | //FIXME: is it safe to assume this field exists? | 450 | //FIXME: is it safe to assume this field exists? |
449 | sp->last_seen_on_cpu = fast_strtoul_10(&cp); | 451 | sp->last_seen_on_cpu = fast_strtoul_10(&cp); |
450 | # endif | 452 | # endif |
451 | #endif /* end of !ENABLE_FEATURE_TOP_SMP_PROCESS */ | 453 | #endif /* FEATURE_FAST_TOP */ |
452 | 454 | ||
453 | #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS | 455 | #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS |
454 | sp->niceness = tasknice; | 456 | sp->niceness = tasknice; |