emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trylink: produce even more info about final link stage

Browse Source 
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
This commit is contained in:
Denis Vlasenko
2007-08-12 20:58:27 +00:00
parent 4185548984
commit 6ca409e0e4
119 changed files with 491 additions and 444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
util-linux/fdisk.c
View File

@@ -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 {

2
util-linux/fdisk_osf.c
View File

@@ -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",

2
util-linux/getopt.c
View File

@@ -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"

6
util-linux/hexdump.c
View File

@@ -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 },

2
util-linux/hwclock.c
View File

@@ -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"

2
util-linux/mdev.c
View File

@@ -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;

6
util-linux/mount.c
View File

@@ -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)

4
util-linux/readprofile.c
View File

@@ -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)