diff options
| author | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2021-01-14 13:28:49 +0000 |
| commit | 89963b524d211e1aec12b72b3725be05ee95c8cf (patch) | |
| tree | 48590aef62b7ee7686b7898256f29def8d9c50b9 /procps/ps.c | |
| parent | 9aa5a829070392c2ac6494d0c4e674c0c2bc7dab (diff) | |
| parent | 2b7c1aa92c68524559a2067609d09309d5c09adc (diff) | |
| download | busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.gz busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.tar.bz2 busybox-w32-89963b524d211e1aec12b72b3725be05ee95c8cf.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
| -rw-r--r-- | procps/ps.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/procps/ps.c b/procps/ps.c index a4de11379..f84060447 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
| @@ -381,7 +381,7 @@ static void func_pcpu(char *buf, int size, const procps_status_t *ps) | |||
| 381 | } | 381 | } |
| 382 | */ | 382 | */ |
| 383 | 383 | ||
| 384 | static const ps_out_t out_spec[] = { | 384 | static const ps_out_t out_spec[] ALIGN_PTR = { |
| 385 | /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */ | 385 | /* Mandated by http://pubs.opengroup.org/onlinepubs/9699919799/utilities/ps.html: */ |
| 386 | { 8 , "user" ,"USER" ,func_user ,PSSCAN_UIDGID }, | 386 | { 8 , "user" ,"USER" ,func_user ,PSSCAN_UIDGID }, |
| 387 | { 8 , "group" ,"GROUP" ,func_group ,PSSCAN_UIDGID }, | 387 | { 8 , "group" ,"GROUP" ,func_group ,PSSCAN_UIDGID }, |