diff options
Diffstat (limited to 'e2fsprogs')
| -rw-r--r-- | e2fsprogs/chattr.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/fsck.c | 4 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/blkid/probe.c | 2 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/e2fsck.c | 14 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/e2p/ostype.c | 4 | ||||
| -rw-r--r-- | e2fsprogs/old_e2fsprogs/fsck.c | 8 |
6 files changed, 17 insertions, 17 deletions
diff --git a/e2fsprogs/chattr.c b/e2fsprogs/chattr.c index 0ac0373..35424f8 100644 --- a/e2fsprogs/chattr.c +++ b/e2fsprogs/chattr.c @@ -38,7 +38,7 @@ struct globals { static unsigned long get_flag(char c) { /* Two separate vectors take less space than vector of structs */ - static const char flags_letter[] = "ASDacdijsutT"; + static const char flags_letter[] ALIGN1 = "ASDacdijsutT"; static const unsigned long flags_val[] = { /* A */ EXT2_NOATIME_FL, /* S */ EXT2_SYNC_FL, diff --git a/e2fsprogs/fsck.c b/e2fsprogs/fsck.c index eb1fa84..dfcbf67 100644 --- a/e2fsprogs/fsck.c +++ b/e2fsprogs/fsck.c @@ -79,7 +79,7 @@ struct fsck_instance { char *base_device; /* /dev/hda for /dev/hdaN etc */ }; -static const char ignored_types[] = +static const char ignored_types[] ALIGN1 = "ignore\0" "iso9660\0" "nfs\0" @@ -90,7 +90,7 @@ static const char ignored_types[] = "devpts\0"; #if 0 -static const char really_wanted[] = +static const char really_wanted[] ALIGN1 = "minix\0" "ext2\0" "ext3\0" diff --git a/e2fsprogs/old_e2fsprogs/blkid/probe.c b/e2fsprogs/old_e2fsprogs/blkid/probe.c index 8c6e2aa..453b4d0 100644 --- a/e2fsprogs/old_e2fsprogs/blkid/probe.c +++ b/e2fsprogs/old_e2fsprogs/blkid/probe.c @@ -379,7 +379,7 @@ static int probe_udf(int fd, blkid_cache cache __BLKID_ATTR((unused)), { int j, bs; struct iso_volume_descriptor isosb; - const char * const * m; + const char *const *m; /* determine the block size by scanning in 2K increments (block sizes larger than 2K will be null padded) */ diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c index efb8700..3d5b4f4 100644 --- a/e2fsprogs/old_e2fsprogs/e2fsck.c +++ b/e2fsprogs/old_e2fsprogs/e2fsck.c @@ -2168,7 +2168,7 @@ static int e2fsck_run_ext3_journal(e2fsck_t ctx) * This function will move the journal inode from a visible file in * the filesystem directory hierarchy to the reserved inode if necessary. */ -static const char * const journal_names[] = { +static const char *const journal_names[] = { ".journal", "journal", ".journal.dat", "journal.dat", 0 }; static void e2fsck_move_ext3_journal(e2fsck_t ctx) @@ -2179,7 +2179,7 @@ static void e2fsck_move_ext3_journal(e2fsck_t ctx) ext2_filsys fs = ctx->fs; ext2_ino_t ino; errcode_t retval; - const char * const * cpp; + const char *const * cpp; int group, mount_flags; clear_problem_context(&pctx); @@ -2372,7 +2372,7 @@ err_out: * abbreviation of the form '@<i>' is expanded by looking up the index * letter <i> in the table below. */ -static const char * const abbrevs[] = { +static const char *const abbrevs[] = { N_("aextended attribute"), N_("Aerror allocating"), N_("bblock"), @@ -2410,7 +2410,7 @@ static const char * const abbrevs[] = { * Give more user friendly names to the "special" inodes. */ #define num_special_inodes 11 -static const char * const special_inode_name[] = +static const char *const special_inode_name[] = { N_("<The NULL inode>"), /* 0 */ N_("<The bad blocks inode>"), /* 1 */ @@ -2485,7 +2485,7 @@ static void expand_at_expression(e2fsck_t ctx, char ch, struct problem_context *pctx, int *first) { - const char * const *cpp; + const char *const *cpp; const char *str; /* Search for the abbreviation */ @@ -8178,7 +8178,7 @@ struct latch_descr { * These are the prompts which are used to ask the user if they want * to fix a problem. */ -static const char * const prompt[] = { +static const char *const prompt[] = { N_("(no prompt)"), /* 0 */ N_("Fix"), /* 1 */ N_("Clear"), /* 2 */ @@ -8206,7 +8206,7 @@ static const char * const prompt[] = { * These messages are printed when we are preen mode and we will be * automatically fixing the problem. */ -static const char * const preen_msg[] = { +static const char *const preen_msg[] = { N_("(NONE)"), /* 0 */ N_("FIXED"), /* 1 */ N_("CLEARED"), /* 2 */ diff --git a/e2fsprogs/old_e2fsprogs/e2p/ostype.c b/e2fsprogs/old_e2fsprogs/e2p/ostype.c index 0e111d4..1abe2ba 100644 --- a/e2fsprogs/old_e2fsprogs/e2p/ostype.c +++ b/e2fsprogs/old_e2fsprogs/e2p/ostype.c @@ -12,7 +12,7 @@ #include <string.h> #include <stdlib.h> -static const char * const os_tab[] = +static const char *const os_tab[] = { "Linux", "Hurd", "Masix", @@ -42,7 +42,7 @@ char *e2p_os2string(int os_type) */ int e2p_string2os(char *str) { - const char * const *cpp; + const char *const *cpp; int i = 0; for (cpp = os_tab; *cpp; cpp++, i++) { diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c index cf39807..2617837 100644 --- a/e2fsprogs/old_e2fsprogs/fsck.c +++ b/e2fsprogs/old_e2fsprogs/fsck.c @@ -115,7 +115,7 @@ struct fsck_instance { * Required for the uber-silly devfs /dev/ide/host1/bus2/target3/lun3 * pathames. */ -static const char * const devfs_hier[] = { +static const char *const devfs_hier[] = { "host", "bus", "target", "lun", 0 }; #endif @@ -124,7 +124,7 @@ static char *base_device(const char *device) { char *str, *cp; #ifdef CONFIG_FEATURE_DEVFS - const char * const *hier; + const char *const *hier; const char *disk; int len; #endif @@ -226,7 +226,7 @@ errout: } -static const char * const ignored_types[] = { +static const char *const ignored_types[] = { "ignore", "iso9660", "nfs", @@ -238,7 +238,7 @@ static const char * const ignored_types[] = { NULL }; -static const char * const really_wanted[] = { +static const char *const really_wanted[] = { "minix", "ext2", "ext3", |