diff options
| author | Rob Landley <rob@landley.net> | 2018-08-25 15:32:22 -0500 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2018-08-25 15:32:22 -0500 |
| commit | 482c422f8e8ec517de071266d425b425c4628103 (patch) | |
| tree | 709d459ba58b1416c340ffedab69faf21d4bee99 /toys/posix/ps.c | |
| parent | 79c403179b603a9f3c8cd120a93c2f560017864b (diff) | |
| download | toybox-482c422f8e8ec517de071266d425b425c4628103.tar.gz | |
Convert more argument variables in GLOBALS() to new style.
Diffstat (limited to 'toys/posix/ps.c')
| -rw-r--r-- | toys/posix/ps.c | 33 |
1 files changed, 6 insertions, 27 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c index 5133b69b..27dc63c5 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -190,40 +190,19 @@ config PKILL GLOBALS( union { struct { - struct arg_list *G; - struct arg_list *g; - struct arg_list *U; - struct arg_list *u; - struct arg_list *t; - struct arg_list *s; - struct arg_list *p; - struct arg_list *O; - struct arg_list *o; - struct arg_list *P; - struct arg_list *k; + struct arg_list *G, *g, *U, *u, *t, *s, *p, *O, *o, *P, *k; } ps; struct { - long n; - long m; + long n, m; char *d; long s; - struct arg_list *u; - struct arg_list *p; - struct arg_list *o; - struct arg_list *k; - struct arg_list *O; + struct arg_list *u, *p, *o, *k, *O; long d_ms; } top; struct { char *L; - struct arg_list *G; - struct arg_list *g; - struct arg_list *P; - struct arg_list *s; - struct arg_list *t; - struct arg_list *U; - struct arg_list *u; + struct arg_list *G, *g, *P, *s, *t, *U, *u; char *d; void *regexes, *snapshot; @@ -399,8 +378,8 @@ struct typography { {"READ", "Data read", 6, SLOT_rchar}, {"WRITE", "Data written", 6, SLOT_wchar}, {"IO", "Data I/O", 6, SLOT_iobytes}, - {"DREAD", "Disk Read", 6, SLOT_rbytes}, - {"DWRITE", "Disk write", 6, SLOT_wbytes}, + {"DREAD", "Data read from disk", 6, SLOT_rbytes}, + {"DWRITE", "Data written to disk", 6, SLOT_wbytes}, {"SWAP", "Swap I/O", 6, SLOT_swap}, {"DIO", "Disk I/O", 6, SLOT_diobytes}, |