Mercurial > hg > toybox
changeset 487:9c43d4191337
Tighten up the source code in largely cosmetic ways.
author | Rob Landley <rob@landley.net> |
---|---|
date | Mon, 20 Feb 2012 23:15:32 -0600 |
parents | 43be4ef80ffe |
children | 9e64ca0e3b79 |
files | toys/lsmod.c |
diffstat | 1 files changed, 6 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/toys/lsmod.c Mon Feb 20 20:20:12 2012 -0600 +++ b/toys/lsmod.c Mon Feb 20 23:15:32 2012 -0600 @@ -23,23 +23,18 @@ void lsmod_main(void) { FILE * file = xfopen("/proc/modules", "r"); - char *name, *size, *refcnt, *users; - xprintf("%-24s Size Used by\n", "Module"); + xprintf("%-23s Size Used by\n", "Module"); while (fgets(toybuf, sizeof(toybuf), file)) { - int len; + char *name = strtok(toybuf, " "), *size = strtok(NULL, " "), + *refcnt = strtok(NULL, " "), *users = strtok(NULL, " "); - name = strtok(toybuf, " "); - size = strtok(NULL, " "); - refcnt = strtok(NULL, " "); - users = strtok(NULL, " "); - - if(name && size && refcnt && users) { - len = strlen(users)-1; + if(users) { + int len = strlen(users)-1; if (users[len] == ',' || users[len] == '-') users[len] = 0; - xprintf("%-20s %8s %s %s\n", name, size, refcnt, users); + xprintf("%-19s %8s %s %s\n", name, size, refcnt, users); } else perror_exit("unrecognized input"); } fclose(file);