diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-13 00:58:27 +0400 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-13 00:58:27 +0400 |
commit | 6ca409e0e4c198fe3081346eebbae3f068fe605a (patch) | |
tree | 060cb05d99220a1eda399194d1209c269f0e8cd8 /util-linux | |
parent | 4185548984357df91311f30c8e43d95f33922576 (diff) |
trylink: produce even more info about final link stage
trylink: explain how to modify link and drastically decrease amount
of padding (unfortunately, needs hand editing ATM).
*: add ALIGN1 / ALIGN2 to global strings and arrays of bytes and shorts
size saving: 0.5k
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/fdisk.c | 14 | ||||
-rw-r--r-- | util-linux/fdisk_osf.c | 2 | ||||
-rw-r--r-- | util-linux/getopt.c | 2 | ||||
-rw-r--r-- | util-linux/hexdump.c | 6 | ||||
-rw-r--r-- | util-linux/hwclock.c | 2 | ||||
-rw-r--r-- | util-linux/mdev.c | 2 | ||||
-rw-r--r-- | util-linux/mount.c | 6 | ||||
-rw-r--r-- | util-linux/readprofile.c | 4 |
8 files changed, 19 insertions, 19 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 0a8dbe94c..2933db472 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -48,12 +48,12 @@ struct hd_geometry { #define HDIO_GETGEO 0x0301 /* get device geometry */ -static const char msg_building_new_label[] = +static const char msg_building_new_label[] ALIGN1 = "Building a new %s. Changes will remain in memory only,\n" "until you decide to write them. After that the previous content\n" "won't be recoverable.\n\n"; -static const char msg_part_already_defined[] = +static const char msg_part_already_defined[] ALIGN1 = "Partition %d is already defined, delete it before re-adding\n"; @@ -82,11 +82,11 @@ struct partition { unsigned char size4[4]; /* nr of sectors in partition */ } ATTRIBUTE_PACKED; -static const char unable_to_open[] = "cannot open %s"; -static const char unable_to_read[] = "cannot read from %s"; -static const char unable_to_seek[] = "cannot seek on %s"; -static const char unable_to_write[] = "cannot write to %s"; -static const char ioctl_error[] = "BLKGETSIZE ioctl failed on %s"; +static const char unable_to_open[] ALIGN1 = "cannot open %s"; +static const char unable_to_read[] ALIGN1 = "cannot read from %s"; +static const char unable_to_seek[] ALIGN1 = "cannot seek on %s"; +static const char unable_to_write[] ALIGN1 = "cannot write to %s"; +static const char ioctl_error[] ALIGN1 = "BLKGETSIZE ioctl failed on %s"; static void fdisk_fatal(const char *why) ATTRIBUTE_NORETURN; enum label_type { diff --git a/util-linux/fdisk_osf.c b/util-linux/fdisk_osf.c index 9f0dc7fd3..f6486d5f9 100644 --- a/util-linux/fdisk_osf.c +++ b/util-linux/fdisk_osf.c @@ -149,7 +149,7 @@ struct xbsd_disklabel { #define BSD_DSTYPE_DOSPART(s) ((s) & 3) /* dos partition number */ #define BSD_DSTYPE_GEOMETRY 0x10 /* drive params in label */ -static const char * const xbsd_dktypenames[] = { +static const char *const xbsd_dktypenames[] = { "unknown", "SMD", "MSCP", diff --git a/util-linux/getopt.c b/util-linux/getopt.c index 41299d2c3..246017036 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -266,7 +266,7 @@ static void set_shell(const char *new_shell) */ #if ENABLE_GETOPT_LONG -static const char getopt_longopts[] = +static const char getopt_longopts[] ALIGN1 = "options\0" Required_argument "o" "longoptions\0" Required_argument "l" "quiet\0" No_argument "q" diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 213f6071b..e294f19da 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c @@ -35,7 +35,7 @@ static void bb_dump_addfile(char *name) fclose(fp); } -static const char * const add_strings[] = { +static const char *const add_strings[] = { "\"%07.7_ax \" 16/1 \"%03o \" \"\\n\"", /* b */ "\"%07.7_ax \" 16/1 \"%3_c \" \"\\n\"", /* c */ "\"%07.7_ax \" 8/2 \" %05u \" \"\\n\"", /* d */ @@ -43,9 +43,9 @@ static const char * const add_strings[] = { "\"%07.7_ax \" 8/2 \" %04x \" \"\\n\"", /* x */ }; -static const char add_first[] = "\"%07.7_Ax\n\""; +static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\""; -static const char hexdump_opts[] = "bcdoxCe:f:n:s:v"; +static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v"; static const struct suffix_mult suffixes[] = { { "b", 512 }, diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c index ede95ecaa..867721482 100644 --- a/util-linux/hwclock.c +++ b/util-linux/hwclock.c @@ -178,7 +178,7 @@ int hwclock_main(int argc, char **argv) int utc; #if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS - static const char hwclock_longopts[] = + static const char hwclock_longopts[] ALIGN1 = "localtime\0" No_argument "l" "utc\0" No_argument "u" "show\0" No_argument "r" diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 17e5e88c6..33dc5d38f 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -233,7 +233,7 @@ static int dirAction(const char *fileName, struct stat *statbuf, * - userspace writes "0" (worked) or "-1" (failed) to /sys/$DEVPATH/loading * - kernel loads firmware into device */ -static inline void load_firmware(const char * const firmware, const char * const sysfs_path) +static void load_firmware(const char *const firmware, const char *const sysfs_path) { int cnt; int firmware_fd, loading_fd, data_fd; diff --git a/util-linux/mount.c b/util-linux/mount.c index a7b0a98f0..c159f41e1 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -888,7 +888,7 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) if (filteropts) for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) { char *opteq = strchr(opt, '='); if (opteq) { - static const char options[] = + static const char options[] ALIGN1 = /* 0 */ "rsize\0" /* 1 */ "wsize\0" /* 2 */ "timeo\0" @@ -991,7 +991,7 @@ static int nfsmount(struct mntent *mp, int vfsflags, char *filteropts) } } else { - static const char options[] = + static const char options[] ALIGN1 = "bg\0" "fg\0" "soft\0" @@ -1524,7 +1524,7 @@ static int singlemount(struct mntent *mp, int ignore_busy) // Parse options, if necessary parse fstab/mtab, and call singlemount for // each directory to be mounted. -static const char must_be_root[] = "you must be root"; +static const char must_be_root[] ALIGN1 = "you must be root"; int mount_main(int argc, char **argv); int mount_main(int argc, char **argv) diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c index 02afedcf0..347621c19 100644 --- a/util-linux/readprofile.c +++ b/util-linux/readprofile.c @@ -38,8 +38,8 @@ #define S_LEN 128 /* These are the defaults */ -static const char defaultmap[] = "/boot/System.map"; -static const char defaultpro[] = "/proc/profile"; +static const char defaultmap[] ALIGN1 = "/boot/System.map"; +static const char defaultpro[] ALIGN1 = "/proc/profile"; int readprofile_main(int argc, char **argv); int readprofile_main(int argc, char **argv) |