diff options
Diffstat (limited to 'coreutils')
-rw-r--r-- | coreutils/cal.c | 4 | ||||
-rw-r--r-- | coreutils/cut.c | 4 | ||||
-rw-r--r-- | coreutils/date.c | 5 | ||||
-rw-r--r-- | coreutils/dd.c | 4 | ||||
-rw-r--r-- | coreutils/df.c | 3 | ||||
-rw-r--r-- | coreutils/du.c | 4 | ||||
-rw-r--r-- | coreutils/env.c | 2 | ||||
-rw-r--r-- | coreutils/expr.c | 2 | ||||
-rw-r--r-- | coreutils/head.c | 4 | ||||
-rw-r--r-- | coreutils/install.c | 2 | ||||
-rw-r--r-- | coreutils/ls.c | 5 | ||||
-rw-r--r-- | coreutils/mkdir.c | 2 | ||||
-rw-r--r-- | coreutils/mknod.c | 2 | ||||
-rw-r--r-- | coreutils/mv.c | 5 | ||||
-rw-r--r-- | coreutils/od.c | 6 | ||||
-rw-r--r-- | coreutils/od_bloaty.c | 34 | ||||
-rw-r--r-- | coreutils/sort.c | 2 | ||||
-rw-r--r-- | coreutils/stat.c | 8 | ||||
-rw-r--r-- | coreutils/stty.c | 58 | ||||
-rw-r--r-- | coreutils/tail.c | 2 | ||||
-rw-r--r-- | coreutils/tr.c | 2 | ||||
-rw-r--r-- | coreutils/uname.c | 4 | ||||
-rw-r--r-- | coreutils/uniq.c | 2 |
23 files changed, 85 insertions, 81 deletions
diff --git a/coreutils/cal.c b/coreutils/cal.c index f8fc0b0d3..37aca00bb 100644 --- a/coreutils/cal.c +++ b/coreutils/cal.c @@ -30,11 +30,11 @@ #define MAXDAYS 42 /* max slots in a month array */ #define SPACE -1 /* used in day array */ -static const unsigned char days_in_month[] = { +static const unsigned char days_in_month[] ALIGN1 = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 }; -static const unsigned char sep1752[] = { +static const unsigned char sep1752[] ALIGN1 = { 1, 2, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30 diff --git a/coreutils/cut.c b/coreutils/cut.c index 435b21070..2598a9a7c 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -15,7 +15,7 @@ /* option vars */ -static const char optstring[] = "b:c:f:d:sn"; +static const char optstring[] ALIGN1 = "b:c:f:d:sn"; #define CUT_OPT_BYTE_FLGS (1<<0) #define CUT_OPT_CHAR_FLGS (1<<1) #define CUT_OPT_FIELDS_FLGS (1<<2) @@ -163,7 +163,7 @@ static void cut_file(FILE * file) } } -static const char _op_on_field[] = " only when operating on fields"; +static const char _op_on_field[] ALIGN1 = " only when operating on fields"; int cut_main(int argc, char **argv); int cut_main(int argc, char **argv) diff --git a/coreutils/date.c b/coreutils/date.c index 5e2bcee3b..5ee70f703 100644 --- a/coreutils/date.c +++ b/coreutils/date.c @@ -63,8 +63,9 @@ int date_main(int argc, char **argv) if (!isofmt_arg) { ifmt = 0; /* default is date */ } else { - static const char * const isoformats[] = - { "date", "hours", "minutes", "seconds" }; + static const char *const isoformats[] = { + "date", "hours", "minutes", "seconds" + }; for (ifmt = 0; ifmt < 4; ifmt++) if (!strcmp(isofmt_arg, isoformats[ifmt])) diff --git a/coreutils/dd.c b/coreutils/dd.c index 3b4b1d785..b17bb5969 100644 --- a/coreutils/dd.c +++ b/coreutils/dd.c @@ -46,7 +46,7 @@ static void dd_output_status(int ATTRIBUTE_UNUSED cur_signal) } static ssize_t full_write_or_warn(int fd, const void *buf, size_t len, - const char * const filename) + const char *const filename) { ssize_t n = full_write(fd, buf, len); if (n < 0) @@ -83,7 +83,7 @@ int dd_main(int argc, char **argv) FLAG_TWOBUFS = 1 << 3, FLAG_COUNT = 1 << 4, }; - static const char keywords[] = + static const char keywords[] ALIGN1 = "bs=\0""count=\0""seek=\0""skip=\0""if=\0""of=\0" #if ENABLE_FEATURE_DD_IBS_OBS "ibs=\0""obs=\0""conv=\0""notrunc\0""sync\0""noerror\0" diff --git a/coreutils/df.c b/coreutils/df.c index 82730806e..5154eeb45 100644 --- a/coreutils/df.c +++ b/coreutils/df.c @@ -42,7 +42,8 @@ int df_main(int argc, char **argv) FILE *mount_table; struct mntent *mount_entry; struct statfs s; - static const char hdr_1k[] = "1k-blocks"; /* default display is kilobytes */ + /* default display is kilobytes */ + static const char hdr_1k[] ALIGN1 = "1k-blocks"; const char *disp_units_hdr = hdr_1k; #ifdef CONFIG_FEATURE_HUMAN_READABLE diff --git a/coreutils/du.c b/coreutils/du.c index cb3e715d9..19748719a 100644 --- a/coreutils/du.c +++ b/coreutils/du.c @@ -48,7 +48,7 @@ static int one_file_system; static dev_t dir_dev; -static void print(long size, const char * const filename) +static void print(long size, const char *const filename) { /* TODO - May not want to defer error checking here. */ #if ENABLE_FEATURE_HUMAN_READABLE @@ -64,7 +64,7 @@ static void print(long size, const char * const filename) } /* tiny recursive du */ -static long du(const char * const filename) +static long du(const char *const filename) { struct stat statbuf; long sum; diff --git a/coreutils/env.c b/coreutils/env.c index 3008358ec..dc8667181 100644 --- a/coreutils/env.c +++ b/coreutils/env.c @@ -35,7 +35,7 @@ extern char **environ; #include "libbb.h" #if ENABLE_FEATURE_ENV_LONG_OPTIONS -static const char env_longopts[] = +static const char env_longopts[] ALIGN1 = "ignore-environment\0" No_argument "i" "unset\0" Required_argument "u" ; diff --git a/coreutils/expr.c b/coreutils/expr.c index 6a4683d90..318fee721 100644 --- a/coreutils/expr.c +++ b/coreutils/expr.c @@ -277,7 +277,7 @@ static VALUE *eval7(void) static VALUE *eval6(void) { - static const char keywords[] = + static const char keywords[] ALIGN1 = "quote\0""length\0""match\0""index\0""substr\0"; VALUE *r, *i1, *i2; diff --git a/coreutils/head.c b/coreutils/head.c index bffba4043..a48f147a2 100644 --- a/coreutils/head.c +++ b/coreutils/head.c @@ -13,7 +13,7 @@ #include "libbb.h" -static const char head_opts[] = +static const char head_opts[] ALIGN1 = "n:" #if ENABLE_FEATURE_FANCY_HEAD "c:qv" @@ -29,7 +29,7 @@ static const struct suffix_mult head_suffixes[] = { }; #endif -static const char header_fmt_str[] = "\n==> %s <==\n"; +static const char header_fmt_str[] ALIGN1 = "\n==> %s <==\n"; int head_main(int argc, char **argv); int head_main(int argc, char **argv) diff --git a/coreutils/install.c b/coreutils/install.c index c2638f492..79cd02036 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -16,7 +16,7 @@ #include "libcoreutils/coreutils.h" #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS -static const char install_longopts[] = +static const char install_longopts[] ALIGN1 = "directory\0" No_argument "d" "preserve-timestamps\0" No_argument "p" "strip\0" No_argument "s" diff --git a/coreutils/ls.c b/coreutils/ls.c index 920fad85e..2b2925557 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -120,7 +120,7 @@ SPLIT_SUBDIR = 2, static smallint show_color; /* long option entry used only for --color, which has no short option * equivalent */ -static const char ls_color_opt[] = +static const char ls_color_opt[] ALIGN1 = "color\0" Optional_argument "\xff" /* no short equivalent */ ; #else @@ -710,7 +710,8 @@ static int list_single(struct dnode *dn) /* "[-]SXvThw", GNU options, busybox optionally supports */ /* "[-]K", SELinux mandated options, busybox optionally supports */ /* "[-]e", I think we made this one up */ -static const char ls_options[] = "Cadil1gnsxAk" +static const char ls_options[] ALIGN1 = + "Cadil1gnsxAk" USE_FEATURE_LS_TIMESTAMPS("cetu") USE_FEATURE_LS_SORTFILES("SXrv") USE_FEATURE_LS_FILETYPES("Fp") diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index a6eaa9612..22a070c31 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -25,7 +25,7 @@ /* This is a NOFORK applet. Be very careful! */ #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS -static const char mkdir_longopts[] = +static const char mkdir_longopts[] ALIGN1 = "mode\0" Required_argument "m" "parents\0" No_argument "p" #if ENABLE_SELINUX diff --git a/coreutils/mknod.c b/coreutils/mknod.c index 415ef55c1..ea6f24ae6 100644 --- a/coreutils/mknod.c +++ b/coreutils/mknod.c @@ -14,7 +14,7 @@ #include "libbb.h" #include "libcoreutils/coreutils.h" -static const char modes_chars[] = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 }; +static const char modes_chars[] ALIGN1 = { 'p', 'c', 'u', 'b', 0, 1, 1, 2 }; static const mode_t modes_cubp[] = { S_IFIFO, S_IFCHR, S_IFBLK }; int mknod_main(int argc, char **argv); diff --git a/coreutils/mv.c b/coreutils/mv.c index 064407838..4cd0fcfba 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -21,7 +21,7 @@ #include "libcoreutils/coreutils.h" #if ENABLE_FEATURE_MV_LONG_OPTIONS -static const char mv_longopts[] = +static const char mv_longopts[] ALIGN1 = "interactive\0" No_argument "i" "force\0" No_argument "f" ; @@ -30,7 +30,8 @@ static const char mv_longopts[] = #define OPT_FILEUTILS_FORCE 1 #define OPT_FILEUTILS_INTERACTIVE 2 -static const char fmt[] = "cannot overwrite %sdirectory with %sdirectory"; +static const char fmt[] ALIGN1 = + "cannot overwrite %sdirectory with %sdirectory"; int mv_main(int argc, char **argv); int mv_main(int argc, char **argv) diff --git a/coreutils/od.c b/coreutils/od.c index 00de080b6..114a746fa 100644 --- a/coreutils/od.c +++ b/coreutils/od.c @@ -131,7 +131,7 @@ odoffset(int argc, char ***argvp) } } -static const char * const add_strings[] = { +static const char *const add_strings[] = { "16/1 \"%3_u \" \"\\n\"", /* a */ "8/2 \" %06o \" \"\\n\"", /* B, o */ "16/1 \"%03o \" \"\\n\"", /* b */ @@ -147,9 +147,9 @@ static const char * const add_strings[] = { "4/4 \" %011o \" \"\\n\"", /* O */ }; -static const char od_opts[] = "aBbcDdeFfHhIiLlOoXxv"; +static const char od_opts[] ALIGN1 = "aBbcDdeFfHhIiLlOoXxv"; -static const char od_o2si[] = { +static const char od_o2si[] ALIGN1 = { 0, 1, 2, 3, 5, 4, 6, 6, 7, 8, 9, 0xa, 0xb, 0xa, 0xa, diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index e30860544..d3c9f9a17 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -129,20 +129,20 @@ struct tspec { 10 unsigned decimal 8 unsigned hexadecimal */ -static const uint8_t bytes_to_oct_digits[] = +static const uint8_t bytes_to_oct_digits[] ALIGN1 = {0, 3, 6, 8, 11, 14, 16, 19, 22, 25, 27, 30, 32, 35, 38, 41, 43}; -static const uint8_t bytes_to_signed_dec_digits[] = +static const uint8_t bytes_to_signed_dec_digits[] ALIGN1 = {1, 4, 6, 8, 11, 13, 16, 18, 20, 23, 25, 28, 30, 33, 35, 37, 40}; -static const uint8_t bytes_to_unsigned_dec_digits[] = +static const uint8_t bytes_to_unsigned_dec_digits[] ALIGN1 = {0, 3, 5, 8, 10, 13, 15, 17, 20, 22, 25, 27, 29, 32, 34, 37, 39}; -static const uint8_t bytes_to_hex_digits[] = +static const uint8_t bytes_to_hex_digits[] ALIGN1 = {0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32}; /* Convert enum size_spec to the size of the named type. */ -static const signed char width_bytes[] = { +static const signed char width_bytes[] ALIGN1 = { -1, sizeof(char), sizeof(short), @@ -212,7 +212,7 @@ static char const *const default_file_list[] = { "-", NULL }; static FILE *in_stream; #define MAX_INTEGRAL_TYPE_SIZE sizeof(ulonglong_t) -static unsigned char integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1] = { +static unsigned char integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1] ALIGN1 = { [sizeof(char)] = CHAR, #if USHRT_MAX != UCHAR_MAX [sizeof(short)] = SHORT, @@ -229,11 +229,11 @@ static unsigned char integral_type_size[MAX_INTEGRAL_TYPE_SIZE + 1] = { }; #define MAX_FP_TYPE_SIZE sizeof(longdouble_t) -static unsigned char fp_type_size[MAX_FP_TYPE_SIZE + 1] = { +static unsigned char fp_type_size[MAX_FP_TYPE_SIZE + 1] ALIGN1 = { /* gcc seems to allow repeated indexes. Last one stays */ [sizeof(longdouble_t)] = FLOAT_LONG_DOUBLE, [sizeof(double)] = FLOAT_DOUBLE, - [sizeof(float)] = FLOAT_SINGLE, + [sizeof(float)] = FLOAT_SINGLE }; @@ -383,7 +383,7 @@ print_named_ascii(size_t n_bytes, const char *block, const char *unused_fmt_string ATTRIBUTE_UNUSED) { /* Names for some non-printing characters. */ - static const char charname[33][3] = { + static const char charname[33][3] ALIGN1 = { "nul", "soh", "stx", "etx", "eot", "enq", "ack", "bel", " bs", " ht", " nl", " vt", " ff", " cr", " so", " si", "dle", "dc1", "dc2", "dc3", "dc4", "nak", "syn", "etb", @@ -560,7 +560,7 @@ decode_one_format(const char *s_orig, const char *s, const char **next, case 'o': case 'u': case 'x': { - static const char CSIL[] = "CSIL"; + static const char CSIL[] ALIGN1 = "CSIL"; c = *s++; p = strchr(CSIL, *s); @@ -596,7 +596,7 @@ decode_one_format(const char *s_orig, const char *s, const char **next, size_spec = integral_type_size[size]; { - static const char doux[] = "doux"; + static const char doux[] ALIGN1 = "doux"; static const char doux_fmt_letter[][4] = { "lld", "llo", "llu", "llx" }; @@ -653,7 +653,7 @@ decode_one_format(const char *s_orig, const char *s, const char **next, } case 'f': { - static const char FDL[] = "FDL"; + static const char FDL[] ALIGN1 = "FDL"; fmt = FLOATING_POINT; ++s; @@ -836,7 +836,7 @@ format_address_none(off_t address ATTRIBUTE_UNUSED, char c ATTRIBUTE_UNUSED) { } -static char address_fmt[] = "%0n"OFF_FMT"xc"; +static char address_fmt[] ALIGN1 = "%0n"OFF_FMT"xc"; /* Corresponds to 'x' above */ #define address_base_char address_fmt[sizeof(address_fmt)-3] /* Corresponds to 'n' above */ @@ -1233,7 +1233,7 @@ int od_main(int argc, char **argv) OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, }; #if ENABLE_GETOPT_LONG - static const char od_longopts[] = + static const char od_longopts[] ALIGN1 = "skip-bytes\0" Required_argument "j" "address-radix\0" Required_argument "A" "read-bytes\0" Required_argument "N" @@ -1268,11 +1268,11 @@ int od_main(int argc, char **argv) argc -= optind; argv += optind; if (opt & OPT_A) { - static const char doxn[] = "doxn"; - static const char doxn_address_base_char[] = { + static const char doxn[] ALIGN1 = "doxn"; + static const char doxn_address_base_char[] ALIGN1 = { 'u', 'o', 'x', /* '?' fourth one is not important */ }; - static const uint8_t doxn_address_pad_len_char[] = { + static const uint8_t doxn_address_pad_len_char[] ALIGN1 = { '7', '7', '6', /* '?' */ }; char *p; diff --git a/coreutils/sort.c b/coreutils/sort.c index 6371139cb..98c1bc34a 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -23,7 +23,7 @@ */ /* These are sort types */ -static const char OPT_STR[] = "ngMucszbrdfimS:T:o:k:t:"; +static const char OPT_STR[] ALIGN1 = "ngMucszbrdfimS:T:o:k:t:"; enum { FLAG_n = 1, /* Numeric sort */ FLAG_g = 2, /* Sort using strtod() */ diff --git a/coreutils/stat.c b/coreutils/stat.c index 7c72127c5..0fddea2bb 100644 --- a/coreutils/stat.c +++ b/coreutils/stat.c @@ -21,7 +21,7 @@ #define OPT_DEREFERENCE (1<<2) #define OPT_SELINUX (1<<3) -static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")]; +static char buf[sizeof("YYYY-MM-DD HH:MM:SS.000000000")] ALIGN1; static char const * file_type(struct stat const *st) { @@ -70,7 +70,7 @@ static char const *human_fstype(long f_type) int i; static const struct types { long type; - const char * const fs; + const char *const fs; } humantypes[] = { { 0xADFF, "affs" }, { 0x1Cd1, "devpts" }, @@ -118,7 +118,7 @@ static char const *human_fstype(long f_type) #if ENABLE_FEATURE_STAT_FORMAT /* print statfs info */ static void print_statfs(char *pformat, const size_t buf_len, const char m, - const char * const filename, void const *data + const char *const filename, void const *data USE_SELINUX(, security_context_t scontext)) { struct statfs const *statfsbuf = data; @@ -168,7 +168,7 @@ static void print_statfs(char *pformat, const size_t buf_len, const char m, /* print stat info */ static void print_stat(char *pformat, const size_t buf_len, const char m, - const char * const filename, void const *data + const char *const filename, void const *data USE_SELINUX(, security_context_t scontext)) { #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) diff --git a/coreutils/stty.c b/coreutils/stty.c index fbb72baa9..863f28d92 100644 --- a/coreutils/stty.c +++ b/coreutils/stty.c @@ -127,28 +127,28 @@ enum { control, input, output, local, combination }; -static const char evenp [] = "evenp"; -static const char raw [] = "raw"; -static const char stty_min [] = "min"; -static const char stty_time [] = "time"; -static const char stty_swtch[] = "swtch"; -static const char stty_eol [] = "eol"; -static const char stty_eof [] = "eof"; -static const char parity [] = "parity"; -static const char stty_oddp [] = "oddp"; -static const char stty_nl [] = "nl"; -static const char stty_ek [] = "ek"; -static const char stty_sane [] = "sane"; -static const char cbreak [] = "cbreak"; -static const char stty_pass8[] = "pass8"; -static const char litout [] = "litout"; -static const char cooked [] = "cooked"; -static const char decctlq [] = "decctlq"; -static const char stty_tabs [] = "tabs"; -static const char stty_lcase[] = "lcase"; -static const char stty_LCASE[] = "LCASE"; -static const char stty_crt [] = "crt"; -static const char stty_dec [] = "dec"; +static const char evenp [] ALIGN1 = "evenp"; +static const char raw [] ALIGN1 = "raw"; +static const char stty_min [] ALIGN1 = "min"; +static const char stty_time [] ALIGN1 = "time"; +static const char stty_swtch[] ALIGN1 = "swtch"; +static const char stty_eol [] ALIGN1 = "eol"; +static const char stty_eof [] ALIGN1 = "eof"; +static const char parity [] ALIGN1 = "parity"; +static const char stty_oddp [] ALIGN1 = "oddp"; +static const char stty_nl [] ALIGN1 = "nl"; +static const char stty_ek [] ALIGN1 = "ek"; +static const char stty_sane [] ALIGN1 = "sane"; +static const char cbreak [] ALIGN1 = "cbreak"; +static const char stty_pass8[] ALIGN1 = "pass8"; +static const char litout [] ALIGN1 = "litout"; +static const char cooked [] ALIGN1 = "cooked"; +static const char decctlq [] ALIGN1 = "decctlq"; +static const char stty_tabs [] ALIGN1 = "tabs"; +static const char stty_lcase[] ALIGN1 = "lcase"; +static const char stty_LCASE[] ALIGN1 = "LCASE"; +static const char stty_crt [] ALIGN1 = "crt"; +static const char stty_dec [] ALIGN1 = "dec"; /* Flags for 'struct mode_info' */ #define SANE_SET 1 /* Set in 'sane' mode */ @@ -158,7 +158,7 @@ static const char stty_dec [] = "dec"; /* Each mode */ struct mode_info { - const char * const name; /* Name given on command line */ + const char *const name; /* Name given on command line */ const unsigned char type; /* Which structure element to change */ const unsigned char flags; /* Setting and display options */ /* were using short here, but ppc32 was unhappy: */ @@ -324,7 +324,7 @@ enum { /* Control character settings */ struct control_info { - const char * const name; /* Name given on command line */ + const char *const name; /* Name given on command line */ const unsigned char saneval; /* Value to set for 'stty sane' */ const unsigned char offset; /* Offset in c_cc */ }; @@ -417,11 +417,11 @@ static const char *visible(unsigned ch) static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode) { - static const unsigned char tcflag_offsets[] = { + static const unsigned char tcflag_offsets[] ALIGN1 = { offsetof(struct termios, c_cflag), /* control */ offsetof(struct termios, c_iflag), /* input */ offsetof(struct termios, c_oflag), /* output */ - offsetof(struct termios, c_lflag), /* local */ + offsetof(struct termios, c_lflag) /* local */ }; if (type <= local) { @@ -430,7 +430,7 @@ static tcflag_t *mode_type_flag(unsigned type, const struct termios *mode) return NULL; } -static void set_speed_or_die(enum speed_setting type, const char * const arg, +static void set_speed_or_die(enum speed_setting type, const char *const arg, struct termios * const mode) { speed_t baud; @@ -560,9 +560,9 @@ enum { param_ospeed = 8 | 0x80, }; -static int find_param(const char * const name) +static int find_param(const char *const name) { - static const char params[] = + static const char params[] ALIGN1 = "line\0" /* 1 */ "rows\0" /* 2 */ "cols\0" /* 3 */ diff --git a/coreutils/tail.c b/coreutils/tail.c index 01469169a..ec21c4234 100644 --- a/coreutils/tail.c +++ b/coreutils/tail.c @@ -63,7 +63,7 @@ static ssize_t tail_read(int fd, char *buf, size_t count) return r; } -static const char header_fmt[] = "\n==> %s <==\n"; +static const char header_fmt[] ALIGN1 = "\n==> %s <==\n"; static unsigned eat_num(const char *p) { diff --git a/coreutils/tr.c b/coreutils/tr.c index 594571833..6a34e3087 100644 --- a/coreutils/tr.c +++ b/coreutils/tr.c @@ -52,7 +52,7 @@ static unsigned int expand(const char *arg, char *buffer) unsigned i; /* XXX: FIXME: use unsigned char? */ unsigned char ac; #define CLO ":]\0" - static const char classes[] = + static const char classes[] ALIGN1 = "alpha"CLO "alnum"CLO "digit"CLO "lower"CLO "upper"CLO "space"CLO "blank"CLO "punct"CLO "cntrl"CLO; #define CLASS_invalid 0 /* we increment the retval */ diff --git a/coreutils/uname.c b/coreutils/uname.c index a934c15f4..8f07f1960 100644 --- a/coreutils/uname.c +++ b/coreutils/uname.c @@ -38,8 +38,8 @@ typedef struct { char processor[8]; /* for "unknown" */ } uname_info_t; -static const char options[] = "snrvmpa"; -static const unsigned short int utsname_offset[] = { +static const char options[] ALIGN1 = "snrvmpa"; +static const unsigned short utsname_offset[] ALIGN2 = { offsetof(uname_info_t,name.sysname), offsetof(uname_info_t,name.nodename), offsetof(uname_info_t,name.release), diff --git a/coreutils/uniq.c b/coreutils/uniq.c index adc196b97..a7caef991 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -12,7 +12,7 @@ #include "libbb.h" -static const char uniq_opts[] = "cdu" "f:s:" "cdu\0\1\2\4"; +static const char uniq_opts[] ALIGN1 = "cdu" "f:s:" "cdu\0\1\2\4"; static FILE *xgetoptfile_uniq_s(char **argv, int read0write2) { |