mirror of
https://github.com/sheumann/hush.git
synced 2024-12-27 01:32:08 +00:00
extern inline is a bad bad thing. kill it (so mkfs_minix.c will
actually compile)
This commit is contained in:
parent
7001480a5e
commit
c774efe317
@ -254,7 +254,7 @@ static inline int bit(char * a,unsigned int i)
|
|||||||
* an already mounted partition. Code adapted from mke2fs, Copyright
|
* an already mounted partition. Code adapted from mke2fs, Copyright
|
||||||
* (C) 1994 Theodore Ts'o. Also licensed under GPL.
|
* (C) 1994 Theodore Ts'o. Also licensed under GPL.
|
||||||
*/
|
*/
|
||||||
extern inline void check_mount(void)
|
static inline void check_mount(void)
|
||||||
{
|
{
|
||||||
FILE *f;
|
FILE *f;
|
||||||
struct mntent *mnt;
|
struct mntent *mnt;
|
||||||
@ -282,7 +282,7 @@ static long valid_offset(int fd, int offset)
|
|||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline int count_blocks(int fd)
|
static inline int count_blocks(int fd)
|
||||||
{
|
{
|
||||||
int high, low;
|
int high, low;
|
||||||
|
|
||||||
@ -301,7 +301,7 @@ extern inline int count_blocks(int fd)
|
|||||||
return (low + 1);
|
return (low + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline int get_size(const char *file)
|
static inline int get_size(const char *file)
|
||||||
{
|
{
|
||||||
int fd;
|
int fd;
|
||||||
long size;
|
long size;
|
||||||
@ -318,7 +318,7 @@ extern inline int get_size(const char *file)
|
|||||||
return size;
|
return size;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline void write_tables(void)
|
static inline void write_tables(void)
|
||||||
{
|
{
|
||||||
/* Mark the super block valid. */
|
/* Mark the super block valid. */
|
||||||
Super.s_state |= MINIX_VALID_FS;
|
Super.s_state |= MINIX_VALID_FS;
|
||||||
@ -368,7 +368,7 @@ static int get_free_block(void)
|
|||||||
return blk;
|
return blk;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline void mark_good_blocks(void)
|
static inline void mark_good_blocks(void)
|
||||||
{
|
{
|
||||||
int blk;
|
int blk;
|
||||||
|
|
||||||
@ -386,7 +386,7 @@ static int next(int zone)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
extern inline void make_bad_inode(void)
|
static inline void make_bad_inode(void)
|
||||||
{
|
{
|
||||||
struct minix_inode *inode = &Inode[MINIX_BAD_INO];
|
struct minix_inode *inode = &Inode[MINIX_BAD_INO];
|
||||||
int i, j, zone;
|
int i, j, zone;
|
||||||
@ -437,7 +437,7 @@ extern inline void make_bad_inode(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_FEATURE_MINIX2
|
#ifdef CONFIG_FEATURE_MINIX2
|
||||||
extern inline void make_bad_inode2(void)
|
static inline void make_bad_inode2(void)
|
||||||
{
|
{
|
||||||
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
|
struct minix2_inode *inode = &Inode2[MINIX_BAD_INO];
|
||||||
int i, j, zone;
|
int i, j, zone;
|
||||||
@ -487,7 +487,7 @@ extern inline void make_bad_inode2(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern inline void make_root_inode(void)
|
static inline void make_root_inode(void)
|
||||||
{
|
{
|
||||||
struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
|
struct minix_inode *inode = &Inode[MINIX_ROOT_INO];
|
||||||
|
|
||||||
@ -510,7 +510,7 @@ extern inline void make_root_inode(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_FEATURE_MINIX2
|
#ifdef CONFIG_FEATURE_MINIX2
|
||||||
extern inline void make_root_inode2(void)
|
static inline void make_root_inode2(void)
|
||||||
{
|
{
|
||||||
struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
|
struct minix2_inode *inode = &Inode2[MINIX_ROOT_INO];
|
||||||
|
|
||||||
@ -533,7 +533,7 @@ extern inline void make_root_inode2(void)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
extern inline void setup_tables(void)
|
static inline void setup_tables(void)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
unsigned long inodes;
|
unsigned long inodes;
|
||||||
@ -603,7 +603,7 @@ extern inline void setup_tables(void)
|
|||||||
* Perform a test of a block; return the number of
|
* Perform a test of a block; return the number of
|
||||||
* blocks readable/writeable.
|
* blocks readable/writeable.
|
||||||
*/
|
*/
|
||||||
extern inline long do_check(char *buffer, int try, unsigned int current_block)
|
static inline long do_check(char *buffer, int try, unsigned int current_block)
|
||||||
{
|
{
|
||||||
long got;
|
long got;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user