summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2006-08-29 19:41:06 +0000
committerRob Landley <rob@landley.net>2006-08-29 19:41:06 +0000
commit88621d73980a3cb53c1f35e64a06d7cd64188987 (patch)
treec0398d52bf44783d2dc330b4b33a908a58d2d55b /util-linux
parent8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff)
downloadbusybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.gz
busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.bz2
busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.zip
Svn 16007 broke the build under gcc 4.0.3. This fixes up some of the damage
(the e2fsprogs directory is too twisty and evil to easily fix, but I plan to rewrite it anyway so I'll just bump that up in priority a bit).
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/fdisk.c6
-rw-r--r--util-linux/fsck_minix.c6
-rw-r--r--util-linux/mkfs_minix.c24
3 files changed, 18 insertions, 18 deletions
diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index 310bd555e..8c7225816 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -1631,13 +1631,13 @@ alpha_bootblock_checksum(char *boot)
1631#endif /* OSF_LABEL */ 1631#endif /* OSF_LABEL */
1632 1632
1633#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL) 1633#if defined(CONFIG_FEATURE_SGI_LABEL) || defined(CONFIG_FEATURE_SUN_LABEL)
1634static inline unsigned short 1634static unsigned short
1635__swap16(unsigned short x) 1635__swap16(unsigned short x)
1636{ 1636{
1637 return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8); 1637 return (((uint16_t)(x) & 0xFF) << 8) | (((uint16_t)(x) & 0xFF00) >> 8);
1638} 1638}
1639 1639
1640static inline uint32_t 1640static uint32_t
1641__swap32(uint32_t x) 1641__swap32(uint32_t x)
1642{ 1642{
1643 return (((x & 0xFF) << 24) | 1643 return (((x & 0xFF) << 24) |
@@ -3919,7 +3919,7 @@ get_sectorsize(void)
3919 } 3919 }
3920} 3920}
3921 3921
3922static inline void 3922static void
3923get_kernel_geometry(void) 3923get_kernel_geometry(void)
3924{ 3924{
3925 struct hd_geometry geometry; 3925 struct hd_geometry geometry;
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index f958bdfc9..da22744c3 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -247,7 +247,7 @@ static void recursive_check(unsigned int ino);
247static void recursive_check2(unsigned int ino); 247static void recursive_check2(unsigned int ino);
248#endif 248#endif
249 249
250static inline int bit(char *a, unsigned int i) 250static int bit(char *a, unsigned int i)
251{ 251{
252 return (a[i >> 3] & (1<<(i & 7))) != 0; 252 return (a[i >> 3] & (1<<(i & 7))) != 0;
253} 253}
@@ -282,7 +282,7 @@ static char *name_component[MAX_DEPTH+1];
282 282
283/* Wed Feb 9 15:17:06 MST 2000 */ 283/* Wed Feb 9 15:17:06 MST 2000 */
284/* dynamically allocate name_list (instead of making it static) */ 284/* dynamically allocate name_list (instead of making it static) */
285static inline void alloc_current_name(void) 285static void alloc_current_name(void)
286{ 286{
287 current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1)); 287 current_name = xmalloc(MAX_DEPTH * (BUFSIZ + 1));
288 current_name[0] = '/'; 288 current_name[0] = '/';
@@ -293,7 +293,7 @@ static inline void alloc_current_name(void)
293#ifdef CONFIG_FEATURE_CLEAN_UP 293#ifdef CONFIG_FEATURE_CLEAN_UP
294/* execute this atexit() to deallocate name_list[] */ 294/* execute this atexit() to deallocate name_list[] */
295/* piptigger was here */ 295/* piptigger was here */
296static inline void free_current_name(void) 296static void free_current_name(void)
297{ 297{
298 free(current_name); 298 free(current_name);
299} 299}
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index a8737a6c9..ed9cb4512 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];
222static int used_good_blocks; 222static int used_good_blocks;
223static unsigned long req_nr_inodes; 223static unsigned long req_nr_inodes;
224 224
225static inline int bit(char * a,unsigned int i) 225static int bit(char * a,unsigned int i)
226{ 226{
227 return (a[i >> 3] & (1<<(i & 7))) != 0; 227 return (a[i >> 3] & (1<<(i & 7))) != 0;
228} 228}
@@ -240,7 +240,7 @@ static inline int bit(char * a,unsigned int i)
240 * an already mounted partition. Code adapted from mke2fs, Copyright 240 * an already mounted partition. Code adapted from mke2fs, Copyright
241 * (C) 1994 Theodore Ts'o. Also licensed under GPL. 241 * (C) 1994 Theodore Ts'o. Also licensed under GPL.
242 */ 242 */
243static inline void check_mount(void) 243static void check_mount(void)
244{ 244{
245 FILE *f; 245 FILE *f;
246 struct mntent *mnt; 246 struct mntent *mnt;
@@ -268,7 +268,7 @@ static long valid_offset(int fd, int offset)
268 return 1; 268 return 1;
269} 269}
270 270
271static inline int count_blocks(int fd) 271static int count_blocks(int fd)
272{ 272{
273 int high, low; 273 int high, low;
274 274
@@ -287,7 +287,7 @@ static inline int count_blocks(int fd)
287 return (low + 1); 287 return (low + 1);
288} 288}
289 289
290static inline int get_size(const char *file) 290static int get_size(const char *file)
291{ 291{
292 int fd; 292 int fd;
293 long size; 293 long size;
@@ -303,7 +303,7 @@ static inline int get_size(const char *file)
303 return size; 303 return size;
304} 304}
305 305
306static inline void write_tables(void) 306static void write_tables(void)
307{ 307{
308 /* Mark the super block valid. */ 308 /* Mark the super block valid. */
309 Super.s_state |= MINIX_VALID_FS; 309 Super.s_state |= MINIX_VALID_FS;
@@ -353,7 +353,7 @@ static int get_free_block(void)
353 return blk; 353 return blk;
354} 354}
355 355
356static inline void mark_good_blocks(void) 356static void mark_good_blocks(void)
357{ 357{
358 int blk; 358 int blk;
359 359
@@ -371,7 +371,7 @@ static int next(int zone)
371 return 0; 371 return 0;
372} 372}
373 373
374static inline void make_bad_inode(void) 374static void make_bad_inode(void)
375{ 375{
376 struct minix_inode *inode = &Inode[MINIX_BAD_INO]; 376 struct minix_inode *inode = &Inode[MINIX_BAD_INO];
377 int i, j, zone; 377 int i, j, zone;
@@ -422,7 +422,7 @@ static inline void make_bad_inode(void)
422} 422}
423 423
424#ifdef CONFIG_FEATURE_MINIX2 424#ifdef CONFIG_FEATURE_MINIX2
425static inline void make_bad_inode2(void) 425static void make_bad_inode2(void)
426{ 426{
427 struct minix2_inode *inode = &Inode2[MINIX_BAD_INO]; 427 struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
428 int i, j, zone; 428 int i, j, zone;
@@ -472,7 +472,7 @@ static inline void make_bad_inode2(void)
472} 472}
473#endif 473#endif
474 474
475static inline void make_root_inode(void) 475static void make_root_inode(void)
476{ 476{
477 struct minix_inode *inode = &Inode[MINIX_ROOT_INO]; 477 struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
478 478
@@ -495,7 +495,7 @@ static inline void make_root_inode(void)
495} 495}
496 496
497#ifdef CONFIG_FEATURE_MINIX2 497#ifdef CONFIG_FEATURE_MINIX2
498static inline void make_root_inode2(void) 498static void make_root_inode2(void)
499{ 499{
500 struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO]; 500 struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
501 501
@@ -518,7 +518,7 @@ static inline void make_root_inode2(void)
518} 518}
519#endif 519#endif
520 520
521static inline void setup_tables(void) 521static void setup_tables(void)
522{ 522{
523 int i; 523 int i;
524 unsigned long inodes; 524 unsigned long inodes;
@@ -594,7 +594,7 @@ static inline void setup_tables(void)
594 * Perform a test of a block; return the number of 594 * Perform a test of a block; return the number of
595 * blocks readable/writable. 595 * blocks readable/writable.
596 */ 596 */
597static inline long do_check(char *buffer, int try, unsigned int current_block) 597static long do_check(char *buffer, int try, unsigned int current_block)
598{ 598{
599 long got; 599 long got;
600 600