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).
author: Rob Landley <rob@landley.net> 2006-08-29 19:41:06 +0000
committer: Rob Landley <rob@landley.net> 2006-08-29 19:41:06 +0000
commit: 88621d73980a3cb53c1f35e64a06d7cd64188987 (patch)
tree: c0398d52bf44783d2dc330b4b33a908a58d2d55b /util-linux/mkfs_minix.c
parent: 8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff)
download: busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.gz
busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.bz2
busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.zip
1 files changed, 12 insertions, 12 deletions
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];
 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;
author	Rob Landley <rob@landley.net>	2006-08-29 19:41:06 +0000
committer	Rob Landley <rob@landley.net>	2006-08-29 19:41:06 +0000
commit	88621d73980a3cb53c1f35e64a06d7cd64188987 (patch)
tree	c0398d52bf44783d2dc330b4b33a908a58d2d55b /util-linux/mkfs_minix.c
parent	8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff)
download	busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.gz busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.tar.bz2 busybox-w32-88621d73980a3cb53c1f35e64a06d7cd64188987.zip

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];
222	static int used_good_blocks;	222	static int used_good_blocks;
223	static unsigned long req_nr_inodes;	223	static unsigned long req_nr_inodes;
224		224
225	static inline int bit(char * a,unsigned int i)	225	static 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	*/
243	static inline void check_mount(void)	243	static 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
271	static inline int count_blocks(int fd)	271	static 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
290	static inline int get_size(const char *file)	290	static 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
306	static inline void write_tables(void)	306	static 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
356	static inline void mark_good_blocks(void)	356	static 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
374	static inline void make_bad_inode(void)	374	static 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
425	static inline void make_bad_inode2(void)	425	static 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
475	static inline void make_root_inode(void)	475	static 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
498	static inline void make_root_inode2(void)	498	static 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
521	static inline void setup_tables(void)	521	static 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	*/
597	static inline long do_check(char *buffer, int try, unsigned int current_block)	597	static long do_check(char *buffer, int try, unsigned int current_block)
598	{	598	{
599	long got;	599	long got;
600		600