summaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorDenis Vlasenko2008-07-08 05:14:36 +0000
committerDenis Vlasenko2008-07-08 05:14:36 +0000
commitdeeed59de0a9bcc068ebd14d7496a6b26e45b890 (patch)
tree7dafd469e9f6bca107adbf930fe77fff9958a0b6 /procps
parent493829207c1c2a36d55aaa13abf806533d0cb87f (diff)
downloadbusybox-deeed59de0a9bcc068ebd14d7496a6b26e45b890.zip
busybox-deeed59de0a9bcc068ebd14d7496a6b26e45b890.tar.gz
libbb: introduce and use xrealloc_vector
function old new delta xrealloc_vector_helper - 51 +51 create_list 84 99 +15 getopt_main 690 695 +5 passwd_main 1049 1053 +4 get_cached 85 89 +4 msh_main 1377 1380 +3 add_match 42 41 -1 read_lines 720 718 -2 grave 1068 1066 -2 fill_match_lines 143 141 -2 add_to_dirlist 67 65 -2 add_input_file 49 47 -2 act 252 250 -2 fsck_main 2252 2246 -6 man_main 765 757 -8 bb_internal_initgroups 228 220 -8 cut_main 1052 1041 -11 add_edge_to_node 55 43 -12 dpkg_main 3851 3835 -16 ifupdown_main 2202 2178 -24 sort_main 838 812 -26 ------------------------------------------------------------------------------ (add/remove: 1/0 grow/shrink: 5/15 up/down: 82/-124) Total: -42 bytes
Diffstat (limited to 'procps')
-rw-r--r--procps/ps.c5
-rw-r--r--procps/top.c5
2 files changed, 5 insertions, 5 deletions
diff --git a/procps/ps.c b/procps/ps.c
index c5dff18..d7ea9fb 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -303,9 +303,8 @@ static const ps_out_t out_spec[] = {
static ps_out_t* new_out_t(void)
{
- int i = out_cnt++;
- out = xrealloc(out, out_cnt * sizeof(*out));
- return &out[i];
+ out = xrealloc_vector(out, 2, out_cnt);
+ return &out[out_cnt++];
}
static const ps_out_t* find_out_spec(const char *name)
diff --git a/procps/top.c b/procps/top.c
index e13cd15..392a3c8 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -814,7 +814,7 @@ int top_main(int argc UNUSED_PARAM, char **argv)
int n;
if (scan_mask == TOP_MASK) {
n = ntop;
- top = xrealloc(top, (++ntop) * sizeof(*top));
+ top = xrealloc_vector(top, 2, ntop++);
top[n].pid = p->pid;
top[n].ppid = p->ppid;
top[n].vsz = p->vsz;
@@ -829,7 +829,8 @@ int top_main(int argc UNUSED_PARAM, char **argv)
if (!(p->mapped_ro | p->mapped_rw))
continue; /* kernel threads are ignored */
n = ntop;
- top = xrealloc(topmem, (++ntop) * sizeof(*topmem));
+ /* No bug here - top and topmem are the same */
+ top = xrealloc_vector(topmem, 2, ntop++);
strcpy(topmem[n].comm, p->comm);
topmem[n].pid = p->pid;
topmem[n].vsz = p->mapped_rw + p->mapped_ro;