diff options
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/fsck_minix.c | |
parent | 8c1eda528a19b8af18568649e8d2b1ba5bda772e (diff) | |
download | busybox-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/fsck_minix.c')
-rw-r--r-- | util-linux/fsck_minix.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); | |||
247 | static void recursive_check2(unsigned int ino); | 247 | static void recursive_check2(unsigned int ino); |
248 | #endif | 248 | #endif |
249 | 249 | ||
250 | static inline int bit(char *a, unsigned int i) | 250 | static 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) */ |
285 | static inline void alloc_current_name(void) | 285 | static 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 */ |
296 | static inline void free_current_name(void) | 296 | static void free_current_name(void) |
297 | { | 297 | { |
298 | free(current_name); | 298 | free(current_name); |
299 | } | 299 | } |