diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-25 10:55:35 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-06-25 10:55:35 +0000 |
commit | 80b8b39899a09c7516920cda5fd343b3086d4824 (patch) | |
tree | aa9903fd6b64d19c5f640fa302272d85c92b204e /procps | |
parent | 1399282b47bb218132a554cbe5b2b0ce4dcc055f (diff) | |
download | busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.tar.gz busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.tar.bz2 busybox-w32-80b8b39899a09c7516920cda5fd343b3086d4824.zip |
Consolidate ARRAY_SIZE macro; remove one unneeded global var (walter harms <wharms@bfs.de>)
Diffstat (limited to 'procps')
-rw-r--r-- | procps/ps.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/procps/ps.c b/procps/ps.c index fd53eca5b..003e8eacd 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -134,8 +134,6 @@ static const ps_out_t out_spec[] = { | |||
134 | #endif | 134 | #endif |
135 | }; | 135 | }; |
136 | 136 | ||
137 | #define VEC_SIZE(v) ( sizeof(v) / sizeof((v)[0]) ) | ||
138 | |||
139 | #if ENABLE_SELINUX | 137 | #if ENABLE_SELINUX |
140 | #define SELINIX_O_PREFIX "label," | 138 | #define SELINIX_O_PREFIX "label," |
141 | #define DEFAULT_O_STR SELINIX_O_PREFIX "pid,user" /* TODO: ,vsz,stat */ ",args" | 139 | #define DEFAULT_O_STR SELINIX_O_PREFIX "pid,user" /* TODO: ,vsz,stat */ ",args" |
@@ -171,7 +169,7 @@ static ps_out_t* new_out_t(void) | |||
171 | static const ps_out_t* find_out_spec(const char *name) | 169 | static const ps_out_t* find_out_spec(const char *name) |
172 | { | 170 | { |
173 | int i; | 171 | int i; |
174 | for (i = 0; i < VEC_SIZE(out_spec); i++) { | 172 | for (i = 0; i < ARRAY_SIZE(out_spec); i++) { |
175 | if (!strcmp(name, out_spec[i].name)) | 173 | if (!strcmp(name, out_spec[i].name)) |
176 | return &out_spec[i]; | 174 | return &out_spec[i]; |
177 | } | 175 | } |