← Commit list

88621d739

Rob Landley
Rob Landley
2006-08-29
SOURCE BUG Duration: 37s

Subject

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).

SOURCE BUG

This commit was genuinely broken at the time (not related to our build system): scripts/config/mkconfigs.c (2005-08-01 - 2006-10-05 arasi) uretilen bbconfigopts.h icine .config satirlarini kacissiz, ham newline'larla gömüyordu - gecerli C degildi, busybox'un kendi bb_mkdep araci bile parse edemiyordu (7d219aab7 ile duzeltildi, mkconfigs shell scripte cevrildi)

→ Bu hatanin tam hikayesini ve duzeltme diffini gor

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

archival/tar.c +5 -5editors/awk.c +1 -1init/init.c +1 -4modutils/insmod.c +1 -1networking/fakeidentd.c +2 -2networking/telnet.c +8 -8networking/zcip.c +1 -1shell/ash.c +32 -57shell/cmdedit.c +2 -2shell/hush.c +19 -23sysklogd/logread.c +2 -2util-linux/fdisk.c +3 -3util-linux/fsck_minix.c +3 -3util-linux/mkfs_minix.c +12 -12
archival/tar.c+5 -5
@@ -115,7 +115,7 @@ enum TarFileType {
typedef enum TarFileType TarFileType;
/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
-static inline void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr,
+static void addHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr,
struct stat *statbuf,
const char *name)
{
@@ -149,7 +149,7 @@ static void freeHardLinkInfo(HardLinkInfo ** hlInfoHeadPtr)
}
/* Might be faster (and bigger) if the dev/ino were stored in numeric order;) */
-static inline HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbuf)
+static HardLinkInfo *findHardLinkInfo(HardLinkInfo * hlInfo, struct stat *statbuf)
{
while (hlInfo) {
if ((statbuf->st_ino == hlInfo->ino) && (statbuf->st_dev == hlInfo->dev))
@@ -194,7 +194,7 @@ static int putOctal(char *cp, int len, long value)
}
/* Write out a tar header for the specified file/directory/whatever */
-static inline int writeTarHeader(struct TarBallInfo *tbInfo,
+static int writeTarHeader(struct TarBallInfo *tbInfo,
const char *header_name, const char *real_name, struct stat *statbuf)
{
long chksum = 0;
@@ -294,7 +294,7 @@ static inline int writeTarHeader(struct TarBallInfo *tbInfo,
}
# ifdef CONFIG_FEATURE_TAR_FROM
-static inline int exclude_file(const llist_t *excluded_files, const char *file)
+static int exclude_file(const llist_t *excluded_files, const char *file)
{
while (excluded_files) {
if (excluded_files->data[0] == '/') {
@@ -411,7 +411,7 @@ static int writeFileToTarball(const char *fileName, struct stat *statbuf,
return (TRUE);
}
-static inline int writeTarFile(const int tar_fd, const int verboseFlag,
+static int writeTarFile(const int tar_fd, const int verboseFlag,
const unsigned long dereferenceFlag, const llist_t *include,
const llist_t *exclude, const int gzip)
{
editors/awk.c+1 -1
@@ -593,7 +593,7 @@ static char nextchar(char **s)
return c;
}
-static inline int isalnum_(int c)
+static int ATTRIBUTE_ALWAYS_INLINE isalnum_(int c)
{
return (isalnum(c) || c == '_');
}
init/init.c+1 -4
@@ -173,10 +173,7 @@ static void loop_forever(void)
#if ENABLE_DEBUG_INIT
#define messageD message
#else
-static inline void messageD(int ATTRIBUTE_UNUSED device,
- const char ATTRIBUTE_UNUSED *fmt, ...)
-{
-}
+#define messageD(...) do {;} while(0);
#endif
static void message(int device, const char *fmt, ...)
__attribute__ ((format(printf, 2, 3)));
modutils/insmod.c+1 -1
@@ -1945,7 +1945,7 @@ static void arch_create_got(struct obj_file *f)
/*======================================================================*/
/* Standard ELF hash function. */
-static inline unsigned long obj_elf_hash_n(const char *name, unsigned long n)
+static unsigned long obj_elf_hash_n(const char *name, unsigned long n)
{
unsigned long h = 0;
unsigned long g;
networking/fakeidentd.c+2 -2
@@ -64,7 +64,7 @@ static void replyError(int s, char *buf);
static const char *nobodystr = "nobody"; /* this needs to be declared like this */
static char *bind_ip_address = "0.0.0.0";
-static inline void movefd(int from, int to)
+static void movefd(int from, int to)
{
if (from != to) {
dup2(from, to);
@@ -108,7 +108,7 @@ static void handlexitsigs(int signum)
}
/* May succeed. If not, won't care. */
-static inline void writepid(uid_t nobody, uid_t nogrp)
+static void writepid(uid_t nobody, uid_t nogrp)
{
char buf[24];
int fd = open(PIDFILE, O_WRONLY|O_CREAT|O_TRUNC, 0664);
networking/telnet.c+8 -8
@@ -88,7 +88,7 @@ struct Globalvars * Gptr;
#define G (*Gptr)
#endif
-static inline void iacflush(void)
+static void iacflush(void)
{
write(G.netfd, G.iacbuf, G.iaclen);
G.iaclen = 0;
@@ -291,7 +291,7 @@ static void handlenetinput(int len)
/* ******************************* */
-static inline void putiac(int c)
+static void putiac(int c)
{
G.iacbuf[G.iaclen++] = c;
}
@@ -428,13 +428,13 @@ static void do_linemode(void)
/* ******************************* */
-static inline void to_notsup(char c)
+static void to_notsup(char c)
{
if (G.telwish == WILL) putiac2(DONT, c);
else if (G.telwish == DO) putiac2(WONT, c);
}
-static inline void to_echo(void)
+static void to_echo(void)
{
/* if server requests ECHO, don't agree */
if (G.telwish == DO) { putiac2(WONT, TELOPT_ECHO); return; }
@@ -461,7 +461,7 @@ static inline void to_echo(void)
WriteCS(1, "\r\n"); /* sudden modec */
}
-static inline void to_sga(void)
+static void to_sga(void)
{
/* daemon always sends will/wont, client do/dont */
@@ -483,7 +483,7 @@ static inline void to_sga(void)
}
#ifdef CONFIG_FEATURE_TELNET_TTYPE
-static inline void to_ttype(void)
+static void to_ttype(void)
{
/* Tell server we will (or won't) do TTYPE */
@@ -497,7 +497,7 @@ static inline void to_ttype(void)
#endif
#ifdef CONFIG_FEATURE_TELNET_AUTOLOGIN
-static inline void to_new_environ(void)
+static void to_new_environ(void)
{
/* Tell server we will (or will not) do AUTOLOGIN */
@@ -511,7 +511,7 @@ static inline void to_new_environ(void)
#endif
#ifdef CONFIG_FEATURE_AUTOWIDTH
-static inline void to_naws(void)
+static void to_naws(void)
{
/* Tell server we will do NAWS */
putiac2(WILL, TELOPT_NAWS);
networking/zcip.c+1 -1
@@ -173,7 +173,7 @@ bad:
/**
* Return milliseconds of random delay, up to "secs" seconds.
*/
-static inline unsigned ms_rdelay(unsigned secs)
+static unsigned ATTRIBUTE_ALWAYS_INLINE ms_rdelay(unsigned secs)
{
return lrand48() % (secs * 1000);
}
shell/ash.c+32 -57
@@ -1591,7 +1591,7 @@ static int varcmp(const char *, const char *);
static struct var **hashvar(const char *);
-static inline int varequal(const char *a, const char *b) {
+static int varequal(const char *a, const char *b) {
return !varcmp(a, b);
}
@@ -1649,8 +1649,7 @@ static void out2str(const char *p)
* This routine initializes the builtin variables.
*/
-static inline void
-initvar(void)
+static void initvar(void)
{
struct var *vp;
struct var *end;
@@ -1674,8 +1673,7 @@ initvar(void)
} while (++vp < end);
}
-static inline void
-init(void)
+static void init(void)
{
/* from input.c: */
@@ -1860,7 +1858,7 @@ static char *stnputs(const char *, size_t, char *);
static char *stputs(const char *, char *);
-static inline char *_STPUTC(int c, char *p) {
+static char *_STPUTC(int c, char *p) {
if (p == sstrend)
p = growstackstr();
*p++ = c;
@@ -2354,8 +2352,7 @@ out:
* cd command.
*/
-static inline const char *
-updatepwd(const char *dir)
+static const char * updatepwd(const char *dir)
{
char *new;
char *p;
@@ -2444,8 +2441,7 @@ out:
* Find out what the current directory is. If we already know the current
* directory, this routine returns immediately.
*/
-static inline char *
-getpwd(void)
+static char * getpwd(void)
{
char *dir = getcwd(0, 0);
return dir ? dir : nullstr;
@@ -3167,8 +3163,7 @@ out:
}
#ifdef CONFIG_ASH_CMDCMD
-static inline char **
-parse_command_args(char **argv, const char **path)
+static char ** parse_command_args(char **argv, const char **path)
{
char *cp, c;
@@ -3199,8 +3194,7 @@ parse_command_args(char **argv, const char **path)
}
#endif
-static inline int
-isassignment(const char *p)
+static int isassignment(const char *p)
{
const char *q = endofname(p);
if (p == q)
@@ -3520,8 +3514,7 @@ funcdone:
}
-static inline int
-goodname(const char *p)
+static int goodname(const char *p)
{
return !*endofname(p);
}
@@ -4245,8 +4238,7 @@ delete_cmd_entry(void)
* the same name - except special builtins.
*/
-static inline void
-addcmdentry(char *name, struct cmdentry *entry)
+static void addcmdentry(char *name, struct cmdentry *entry)
{
struct tblentry *cmdp;
@@ -4263,8 +4255,7 @@ addcmdentry(char *name, struct cmdentry *entry)
* Make a copy of a parse tree.
*/
-static inline struct funcnode *
-copyfunc(union node *n)
+static struct funcnode * copyfunc(union node *n)
{
struct funcnode *f;
size_t blocksize;
@@ -4529,8 +4520,7 @@ static void varunset(const char *, const char *, const char *, int)
* Returns an stalloced string.
*/
-static inline char *
-preglob(const char *pattern, int quoted, int flag) {
+static char * preglob(const char *pattern, int quoted, int flag) {
flag |= RMESCAPE_GLOB;
if (quoted) {
flag |= RMESCAPE_QUOTED;
@@ -4554,8 +4544,7 @@ esclen(const char *start, const char *p) {
* Expand shell variables and backquotes inside a here document.
*/
-static inline void
-expandhere(union node *arg, int fd)
+static void expandhere(union node *arg, int fd)
{
herefd = fd;
expandarg(arg, (struct arglist *)NULL, 0);
@@ -5783,8 +5772,7 @@ msort(struct strlist *list, int len)
* Returns true if the pattern matches the string.
*/
-static inline int
-patmatch(char *pattern, const char *string)
+static int patmatch(char *pattern, const char *string)
{
return pmatch(preglob(pattern, 0, 0), string);
}
@@ -5967,7 +5955,7 @@ static int pgetc2(void)
return c;
}
#else
-static inline int pgetc2(void)
+static int pgetc2(void)
{
return pgetc_macro();
}
@@ -5977,8 +5965,7 @@ static inline int pgetc2(void)
* Read a line from the script.
*/
-static inline char *
-pfgets(char *line, int len)
+static char * pfgets(char *line, int len)
{
char *p = line;
int nleft = len;
@@ -6007,7 +5994,7 @@ static char *cmdedit_prompt;
#else
static const char *cmdedit_prompt;
#endif
-static inline void putprompt(const char *s)
+static void putprompt(const char *s)
{
#ifdef CONFIG_ASH_EXPAND_PRMT
free(cmdedit_prompt);
@@ -6017,14 +6004,13 @@ static inline void putprompt(const char *s)
#endif
}
#else
-static inline void putprompt(const char *s)
+static void putprompt(const char *s)
{
out2str(s);
}
#endif
-static inline int
-preadfd(void)
+static int preadfd(void)
{
int nr;
char *buf = parsefile->buf;
@@ -7120,8 +7106,7 @@ growjobtab(void)
* Called with interrupts off.
*/
-static inline void
-forkchild(struct job *jp, union node *n, int mode)
+static void forkchild(struct job *jp, union node *n, int mode)
{
int oldlvl;
@@ -7168,8 +7153,7 @@ forkchild(struct job *jp, union node *n, int mode)
jobless = 0;
}
-static inline void
-forkparent(struct job *jp, union node *n, int mode, pid_t pid)
+static void forkparent(struct job *jp, union node *n, int mode, pid_t pid)
{
TRACE(("In parent shell: child = %d\n", pid));
if (!jp) {
@@ -7306,8 +7290,7 @@ waitforjob(struct job *jp)
* and the jobs command may give out of date information.
*/
-static inline int
-waitproc(int block, int *status)
+static int waitproc(int block, int *status)
{
int flags = 0;
@@ -8071,8 +8054,7 @@ readcmdfile(char *name)
* search for the file, which is necessary to find sub-commands.
*/
-static inline char *
-find_dot_file(char *name)
+static char * find_dot_file(char *name)
{
char *fullname;
const char *path = pathval();
@@ -8347,8 +8329,7 @@ growstackblock(void)
}
}
-static inline void
-grabstackblock(size_t len)
+static void grabstackblock(size_t len)
{
len = SHELL_ALIGN(len);
stacknxt += len;
@@ -8830,8 +8811,7 @@ optschanged(void)
setvimode(viflag);
}
-static inline void
-minus_o(char *name, int val)
+static void minus_o(char *name, int val)
{
int i;
@@ -10902,8 +10882,7 @@ static const char *const *findkwd(const char *s)
* Open a file in noclobber mode.
* The code was copied from bash.
*/
-static inline int
-noclobberopen(const char *fname)
+static int noclobberopen(const char *fname)
{
int r, fd;
struct stat finfo, finfo2;
@@ -10962,8 +10941,7 @@ noclobberopen(const char *fname)
* the pipe without forking.
*/
-static inline int
-openhere(union node *redir)
+static int openhere(union node *redir)
{
int pip[2];
size_t len = 0;
@@ -11055,8 +11033,7 @@ eopen:
sh_error("cannot open %s: %s", fname, errmsg(errno, E_OPEN));
}
-static inline void
-dupredirect(union node *redir, int f)
+static void dupredirect(union node *redir, int f)
{
int fd = redir->nfile.fd;
@@ -12231,8 +12208,7 @@ exportcmd(int argc, char **argv)
* "-" as a special case.
*/
-static inline void
-mklocal(char *name)
+static void mklocal(char *name)
{
struct localvar *lvp;
struct var **vpp;
@@ -13186,7 +13162,7 @@ typedef unsigned char operator;
#define NUMPTR (*numstackptr)
-static inline int tok_have_assign(operator op)
+static int tok_have_assign(operator op)
{
operator prec = PREC(op);
@@ -13195,7 +13171,7 @@ static inline int tok_have_assign(operator op)
prec == PREC_PRE || prec == PREC_POST);
}
-static inline int is_right_associativity(operator prec)
+static int is_right_associativity(operator prec)
{
return (prec == PREC(TOK_ASSIGN) || prec == PREC(TOK_EXPONENT) ||
prec == PREC(TOK_CONDITIONAL));
@@ -13258,8 +13234,7 @@ static int arith_lookup_val(v_n_t *t)
/* "applying" a token means performing it on the top elements on the integer
* stack. For a unary operator it will only change the top element, but a
* binary operator will pop two arguments and push a result */
-static inline int
-arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
+static int arith_apply(operator op, v_n_t *numstack, v_n_t **numstackptr)
{
v_n_t *numptr_m1;
arith_t numptr_val, rez;
shell/cmdedit.c+2 -2
@@ -247,13 +247,13 @@ static void goto_new_line(void)
}
-static inline void out1str(const char *s)
+static void out1str(const char *s)
{
if ( s )
fputs(s, stdout);
}
-static inline void beep(void)
+static void beep(void)
{
putchar('\007');
}
shell/hush.c+19 -23
@@ -285,7 +285,7 @@ struct built_in_command {
};
/* belongs in busybox.h */
-static inline int max(int a, int b) {
+static int max(int a, int b) {
return (a>b)?a:b;
}
@@ -298,8 +298,14 @@ static void debug_printf(const char *format, ...)
vfprintf(stderr, format, args);
va_end(args);
}
+/* broken, of course, but OK for testing */
+static char *indenter(int i)
+{
+ static char blanks[]=" ";
+ return &blanks[sizeof(blanks)-i-1];
+}
#else
-static inline void debug_printf(const char *format ATTRIBUTE_UNUSED, ...) { }
+#define debug_printf(...) do {;} while(0);
#endif
#define final_printf debug_printf
@@ -345,7 +351,6 @@ static void mark_open(int fd);
static void mark_closed(int fd);
static void close_all(void);
/* "run" the final data structures: */
-static char *indenter(int i);
static int free_pipe_list(struct pipe *head, int indent);
static int free_pipe(struct pipe *pi, int indent);
/* really run the final data structures: */
@@ -847,7 +852,7 @@ static int static_peek(struct in_str *i)
return *i->p;
}
-static inline void cmdedit_set_initial_prompt(void)
+static void cmdedit_set_initial_prompt(void)
{
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
PS1 = NULL;
@@ -858,7 +863,7 @@ static inline void cmdedit_set_initial_prompt(void)
#endif
}
-static inline void setup_prompt_string(int promptmode, char **prompt_str)
+static void setup_prompt_string(int promptmode, char **prompt_str)
{
debug_printf("setup_prompt_string %d ",promptmode);
#ifndef CONFIG_FEATURE_SH_FANCY_PROMPT
@@ -1591,13 +1596,6 @@ static int run_list_real(struct pipe *pi)
return rcode;
}
-/* broken, of course, but OK for testing */
-static char *indenter(int i)
-{
- static char blanks[]=" ";
- return &blanks[sizeof(blanks)-i-1];
-}
-
/* return code is the exit status of the pipe */
static int free_pipe(struct pipe *pi, int indent)
{
@@ -1605,29 +1603,28 @@ static int free_pipe(struct pipe *pi, int indent)
struct child_prog *child;
struct redir_struct *r, *rnext;
int a, i, ret_code=0;
- char *ind = indenter(indent);
if (pi->stopped_progs > 0)
return ret_code;
- final_printf("%s run pipe: (pid %d)\n",ind,getpid());
+ final_printf("%s run pipe: (pid %d)\n",indenter(indent),getpid());
for (i=0; i<pi->num_progs; i++) {
child = &pi->progs[i];
- final_printf("%s command %d:\n",ind,i);
+ final_printf("%s command %d:\n",indenter(indent),i);
if (child->argv) {
for (a=0,p=child->argv; *p; a++,p++) {
- final_printf("%s argv[%d] = %s\n",ind,a,*p);
+ final_printf("%s argv[%d] = %s\n",indenter(indent),a,*p);
}
globfree(&child->glob_result);
child->argv=NULL;
} else if (child->group) {
- final_printf("%s begin group (subshell:%d)\n",ind, child->subshell);
+ final_printf("%s begin group (subshell:%d)\n",indenter(indent), child->subshell);
ret_code = free_pipe_list(child->group,indent+3);
- final_printf("%s end group\n",ind);
+ final_printf("%s end group\n",indenter(indent));
} else {
- final_printf("%s (nil)\n",ind);
+ final_printf("%s (nil)\n",indenter(indent));
}
for (r=child->redirects; r; r=rnext) {
- final_printf("%s redirect %d%s", ind, r->fd, redir_table[r->type].descrip);
+ final_printf("%s redirect %d%s", indenter(indent), r->fd, redir_table[r->type].descrip);
if (r->dup == -1) {
/* guard against the case >$FOO, where foo is unset or blank */
if (r->word.gl_pathv) {
@@ -1651,11 +1648,10 @@ static int free_pipe_list(struct pipe *head, int indent)
{
int rcode=0; /* if list has no members */
struct pipe *pi, *next;
- char *ind = indenter(indent);
for (pi=head; pi; pi=next) {
- final_printf("%s pipe reserved mode %d\n", ind, pi->r_mode);
+ final_printf("%s pipe reserved mode %d\n", indenter(indent), pi->r_mode);
rcode = free_pipe(pi, indent);
- final_printf("%s pipe followup code %d\n", ind, pi->followup);
+ final_printf("%s pipe followup code %d\n", indenter(indent), pi->followup);
next=pi->next;
pi->next=NULL;
free(pi);
sysklogd/logread.c+2 -2
@@ -46,7 +46,7 @@ static void interrupted(int sig);
/*
* sem_up - up()'s a semaphore.
*/
-static inline void sem_up(int semid)
+static void sem_up(int semid)
{
if ( semop(semid, SMrup, 1) == -1 )
error_exit("semop[SMrup]");
@@ -55,7 +55,7 @@ static inline void sem_up(int semid)
/*
* sem_down - down()'s a semaphore
*/
-static inline void sem_down(int semid)
+static void sem_down(int semid)
{
if ( semop(semid, SMrdn, 2) == -1 )
error_exit("semop[SMrdn]");
util-linux/fdisk.c+3 -3
@@ -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;
util-linux/fsck_minix.c+3 -3
@@ -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);
}
util-linux/mkfs_minix.c+12 -12
@@ -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;