diff options
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/nmeter.c | 6 | ||||
| -rw-r--r-- | procps/renice.c | 7 | ||||
| -rw-r--r-- | procps/sysctl.c | 25 |
3 files changed, 21 insertions, 17 deletions
diff --git a/procps/nmeter.c b/procps/nmeter.c index 4f78a14..127a3d1 100644 --- a/procps/nmeter.c +++ b/procps/nmeter.c @@ -36,7 +36,7 @@ static const char *const proc_name[] = { "net/dev", "meminfo", "diskstats", - "sys/fs/file-nr", + "sys/fs/file-nr" }; struct globals { @@ -754,7 +754,7 @@ static void collect_info(s_stat *s) typedef s_stat* init_func(const char *param); -static const char options[] = "ncmsfixptbdr"; +static const char options[] ALIGN1 = "ncmsfixptbdr"; static init_func *const init_functions[] = { init_if, init_cpu, @@ -767,7 +767,7 @@ static init_func *const init_functions[] = { init_time, init_blk, init_delay, - init_cr, + init_cr }; int nmeter_main(int argc, char **argv); diff --git a/procps/renice.c b/procps/renice.c index 6c5bb0e..b2a9ed7 100644 --- a/procps/renice.c +++ b/procps/renice.c @@ -29,7 +29,7 @@ void BUG_bad_PRIO_USER(void); int renice_main(int argc, char **argv); int renice_main(int argc, char **argv) { - static const char Xetpriority_msg[] = "%cetpriority"; + static const char Xetpriority_msg[] ALIGN1 = "%cetpriority"; int retval = EXIT_SUCCESS; int which = PRIO_PROCESS; /* Default 'which' value. */ @@ -67,8 +67,9 @@ int renice_main(int argc, char **argv) while ((arg = *++argv) != NULL) { /* Check for a mode switch. */ if (arg[0] == '-' && arg[1]) { - static const char opts[] - = { 'p', 'g', 'u', 0, PRIO_PROCESS, PRIO_PGRP, PRIO_USER }; + static const char opts[] ALIGN1 = { + 'p', 'g', 'u', 0, PRIO_PROCESS, PRIO_PGRP, PRIO_USER + }; const char *p = strchr(opts, arg[1]); if (p) { which = p[4]; diff --git a/procps/sysctl.c b/procps/sysctl.c index a0e9e16..5100f57 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c @@ -27,24 +27,27 @@ static int sysctl_display_all(const char *path, int output, int show_table); /* * Globals... */ -static const char PROC_PATH[] = "/proc/sys/"; -static const char DEFAULT_PRELOAD[] = "/etc/sysctl.conf"; +static const char PROC_PATH[] ALIGN1 = "/proc/sys/"; +static const char DEFAULT_PRELOAD[] ALIGN1 = "/etc/sysctl.conf"; /* error messages */ -static const char ERR_UNKNOWN_PARAMETER[] = "error: Unknown parameter '%s'\n"; -static const char ERR_MALFORMED_SETTING[] = "error: Malformed setting '%s'\n"; -static const char ERR_NO_EQUALS[] = +static const char ERR_UNKNOWN_PARAMETER[] ALIGN1 = + "error: Unknown parameter '%s'\n"; +static const char ERR_MALFORMED_SETTING[] ALIGN1 = + "error: Malformed setting '%s'\n"; +static const char ERR_NO_EQUALS[] ALIGN1 = "error: '%s' must be of the form name=value\n"; -static const char ERR_INVALID_KEY[] = "error: '%s' is an unknown key\n"; -static const char ERR_UNKNOWN_WRITING[] = +static const char ERR_INVALID_KEY[] ALIGN1 = + "error: '%s' is an unknown key\n"; +static const char ERR_UNKNOWN_WRITING[] ALIGN1 = "error: unknown error %d setting key '%s'\n"; -static const char ERR_UNKNOWN_READING[] = +static const char ERR_UNKNOWN_READING[] ALIGN1 = "error: unknown error %d reading key '%s'\n"; -static const char ERR_PERMISSION_DENIED[] = +static const char ERR_PERMISSION_DENIED[] ALIGN1 = "error: permission denied on key '%s'\n"; -static const char ERR_PRELOAD_FILE[] = +static const char ERR_PRELOAD_FILE[] ALIGN1 = "error: cannot open preload file '%s'\n"; -static const char WARN_BAD_LINE[] = +static const char WARN_BAD_LINE[] ALIGN1 = "warning: %s(%d): invalid syntax, continuing...\n"; |