diff options
author | Matt Kraai <kraai@debian.org> | 2000-07-15 03:28:47 +0400 |
---|---|---|
committer | Matt Kraai <kraai@debian.org> | 2000-07-15 03:28:47 +0400 |
commit | 3bd8bd89ee9d0b65bf279e1ecad826a5f2f0a217 (patch) | |
tree | 6a217bf17e7c00e98a47f657015535f21b53cedd /procps | |
parent | 464c5de00d3dfb5f01e866f703d95bbb2bb9443c (diff) |
Don't use strings directly in calls to usage(). This is in preparation
for their extraction to a separate file.
Diffstat (limited to 'procps')
-rw-r--r-- | procps/free.c | 16 | ||||
-rw-r--r-- | procps/ps.c | 19 |
2 files changed, 18 insertions, 17 deletions
diff --git a/procps/free.c b/procps/free.c index 997430b39..7c9d7f10a 100644 --- a/procps/free.c +++ b/procps/free.c @@ -25,6 +25,12 @@ #include <stdio.h> #include <errno.h> +const char free_usage[] = + "free\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nDisplays the amount of free and used system memory\n" +#endif + ; extern int free_main(int argc, char **argv) { @@ -53,14 +59,8 @@ extern int free_main(int argc, char **argv) info.sharedram*=info.mem_unit; info.bufferram*=info.mem_unit; } - if (argc > 1 && **(argv + 1) == '-') { - usage("free\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nDisplays the amount of free and used system memory\n" -#endif - ); - } - + if (argc > 1 && **(argv + 1) == '-') + usage(free_usage); printf("%6s%13s%13s%13s%13s%13s\n", "", "total", "used", "free", "shared", "buffers"); diff --git a/procps/ps.c b/procps/ps.c index b070e3984..74e79f5f8 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -114,6 +114,13 @@ static void parse_proc_status(char *S, proc_t * P) } +const char ps_usage[] = + "ps\n" +#ifndef BB_FEATURE_TRIVIAL_HELP + "\nReport process status\n" + "\nThis version of ps accepts no options.\n" +#endif + ; extern int ps_main(int argc, char **argv) { @@ -134,14 +141,8 @@ extern int ps_main(int argc, char **argv) - if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) { - usage ("ps\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nReport process status\n" - "\nThis version of ps accepts no options.\n" -#endif - ); - } + if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) + usage(ps_usage); dir = opendir("/proc"); if (!dir) @@ -223,7 +224,7 @@ extern int ps_main(int argc, char **argv) #endif if (argc > 1 && **(argv + 1) == '-') - usage("ps-devps\n\nReport process status\n\nThis version of ps accepts no options.\n\n"); + usage(ps_usage); /* open device */ fd = open(device, O_RDONLY); |