diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/fdisk.c | 6 | ||||
| -rw-r--r-- | util-linux/fsck_minix.c | 6 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 24 |
3 files changed, 18 insertions, 18 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index 310bd55..8c72258 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -1631,13 +1631,13 @@ alpha_bootblock_checksum(char *boot) #endif /* OSF_LABEL */ #if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) -static inline unsigned short +static unsigned short __swap16(unsigned short x) { return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); } -static inline uint32_t +static uint32_t __swap32(uint32_t x) { return (((x & 0xFF) << 24) | @@ -3919,7 +3919,7 @@ get_sectorsize(void) } } -static inline void +static void get_kernel_geometry(void) { struct hd_geometry geometry; diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c index f958bdf..da22744 100644 --- a/util-linux/fsck_minix.c +++ b/util-linux/fsck_minix.c @@ -247,7 +247,7 @@ static void recursive_check(unsigned int ino); static void recursive_check2(unsigned int ino); #endif -static inline int bit(char *a, unsigned int i) +static int bit(char *a, unsigned int i) { return (a[i >> 3] & (1<<(i & 7))) != 0; } @@ -282,7 +282,7 @@ static char *name_component[MAX_DEPTH+1]; /* Wed Feb 9 15:17:06 MST 2000 */ /* dynamically allocate name_list (instead of making it static) */ -static inline void alloc_current_name(void) +static void alloc_current_name(void) { current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1)); current_name[0] = '/'; @@ -293,7 +293,7 @@ static inline void alloc_current_name(void) #ifdef CONFIG_FEATURE_CLEAN_UP /* execute this atexit() to deallocate name_list[] */ /* piptigger was here */ -static inline void free_current_name(void) +static void free_current_name(void) { free(current_name); } diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index a8737a6..ed9cb45 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -222,7 +222,7 @@ static unsigned short good_blocks_table[MAX_GOOD_BLOCKS]; static int used_good_blocks; static unsigned long req_nr_inodes; -static inline int bit(char * a,unsigned int i) +static int bit(char * a,unsigned int i) { return (a[i >> 3] & (1<<(i & 7))) != 0; } @@ -240,7 +240,7 @@ static inline int bit(char * a,unsigned int i) * an already mounted partition. Code adapted from mke2fs, Copyright * (C) 1994 Theodore Ts'o. Also licensed under GPL. */ -static inline void check_mount(void) +static void check_mount(void) { FILE *f; struct mntent *mnt; @@ -268,7 +268,7 @@ static long valid_offset(int fd, int offset) return 1; } -static inline int count_blocks(int fd) +static int count_blocks(int fd) { int high, low; @@ -287,7 +287,7 @@ static inline int count_blocks(int fd) return (low + 1); } -static inline int get_size(const char *file) +static int get_size(const char *file) { int fd; long size; @@ -303,7 +303,7 @@ static inline int get_size(const char *file) return size; } -static inline void write_tables(void) +static void write_tables(void) { /* Mark the super block valid. */ Super.s_state |= MINIX_VALID_FS; @@ -353,7 +353,7 @@ static int get_free_block(void) return blk; } -static inline void mark_good_blocks(void) +static void mark_good_blocks(void) { int blk; @@ -371,7 +371,7 @@ static int next(int zone) return 0; } -static inline void make_bad_inode(void) +static void make_bad_inode(void) { struct minix_inode *inode = &Inode[MINIX_BAD_INO]; int i, j, zone; @@ -422,7 +422,7 @@ static inline void make_bad_inode(void) } #ifdef CONFIG_FEATURE_MINIX2 -static inline void make_bad_inode2(void) +static void make_bad_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; int i, j, zone; @@ -472,7 +472,7 @@ static inline void make_bad_inode2(void) } #endif -static inline void make_root_inode(void) +static void make_root_inode(void) { struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; @@ -495,7 +495,7 @@ static inline void make_root_inode(void) } #ifdef CONFIG_FEATURE_MINIX2 -static inline void make_root_inode2(void) +static void make_root_inode2(void) { struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; @@ -518,7 +518,7 @@ static inline void make_root_inode2(void) } #endif -static inline void setup_tables(void) +static void setup_tables(void) { int i; unsigned long inodes; @@ -594,7 +594,7 @@ static inline void setup_tables(void) * Perform a test of a block; return the number of * blocks readable/writable. */ -static inline long do_check(char *buffer, int try, unsigned int current_block) +static long do_check(char *buffer, int try, unsigned int current_block) { long got; |