diff options
| author | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2013-02-07 14:25:54 +0000 |
| commit | b604585914e032b28bef3e337a978e56a9069cda (patch) | |
| tree | b2ee0a3fb38d10397c602d0fe215ea3bbbf334c0 /libbb/procps.c | |
| parent | 0eda07c7ff8cf1fc11bc1bda5383f884d7adf031 (diff) | |
| parent | ba76b7a40b929878833731f76306b1c977cc8650 (diff) | |
| download | busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.gz busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.tar.bz2 busybox-w32-b604585914e032b28bef3e337a978e56a9069cda.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/procps.c')
| -rw-r--r-- | libbb/procps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/procps.c b/libbb/procps.c index c6977da51..e2f54d730 100644 --- a/libbb/procps.c +++ b/libbb/procps.c | |||
| @@ -181,7 +181,7 @@ static char *skip_fields(char *str, int count) | |||
| 181 | 181 | ||
| 182 | #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP | 182 | #if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP |
| 183 | int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total, | 183 | int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total, |
| 184 | void (*cb)(struct smaprec *, void *), void *data) | 184 | void (*cb)(struct smaprec *, void *), void *data) |
| 185 | { | 185 | { |
| 186 | FILE *file; | 186 | FILE *file; |
| 187 | struct smaprec currec; | 187 | struct smaprec currec; |