summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2006-01-24 15:11:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2006-01-24 15:11:08 +0000
commit7905c54d9da3e6243441358133d13395e7a43a4c (patch)
tree3120f390b598981ec243a0511e7c078c740c5f26
parentcb76a5870235859c0060daad78d28e2a33fe79aa (diff)
downloaddrakx-7905c54d9da3e6243441358133d13395e7a43a4c.tar
drakx-7905c54d9da3e6243441358133d13395e7a43a4c.tar.gz
drakx-7905c54d9da3e6243441358133d13395e7a43a4c.tar.bz2
drakx-7905c54d9da3e6243441358133d13395e7a43a4c.tar.xz
drakx-7905c54d9da3e6243441358133d13395e7a43a4c.zip
be compliant with recent gcc (from peroyvind)
-rw-r--r--mdk-stage1/insmod-modutils/obj/obj_kallsyms.c8
-rw-r--r--mdk-stage1/insmod-modutils/util/config.c2
-rw-r--r--mdk-stage1/insmod-modutils/util/modstat.c2
3 files changed, 6 insertions, 6 deletions
diff --git a/mdk-stage1/insmod-modutils/obj/obj_kallsyms.c b/mdk-stage1/insmod-modutils/obj/obj_kallsyms.c
index 1836141e9..917a007e1 100644
--- a/mdk-stage1/insmod-modutils/obj/obj_kallsyms.c
+++ b/mdk-stage1/insmod-modutils/obj/obj_kallsyms.c
@@ -200,8 +200,8 @@ obj_kallsyms (struct obj_file *fin, struct obj_file **fout_result)
/* Initial contents, header + one entry per input section. No strings. */
osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
- a_hdr = (struct kallsyms_header *) osec->contents =
- xmalloc(osec->header.sh_size);
+ a_hdr = (struct kallsyms_header *) (osec->contents =
+ xmalloc(osec->header.sh_size));
memset(osec->contents, 0, osec->header.sh_size);
a_hdr->size = sizeof(*a_hdr);
a_hdr->sections = loaded;
@@ -275,8 +275,8 @@ obj_kallsyms (struct obj_file *fin, struct obj_file **fout_result)
a_hdr->symbol_off +
a_hdr->symbols*a_hdr->symbol_size +
strings_size - strings_left;
- a_hdr = (struct kallsyms_header *) osec->contents =
- xrealloc(a_hdr, a_hdr->total_size);
+ a_hdr = (struct kallsyms_header *) (osec->contents =
+ xrealloc(a_hdr, a_hdr->total_size));
p = (char *)a_hdr + a_hdr->symbol_off;
memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
free(symbols);
diff --git a/mdk-stage1/insmod-modutils/util/config.c b/mdk-stage1/insmod-modutils/util/config.c
index 7568d955f..778fe2b7f 100644
--- a/mdk-stage1/insmod-modutils/util/config.c
+++ b/mdk-stage1/insmod-modutils/util/config.c
@@ -1496,7 +1496,7 @@ static int config_add(const char *file, const struct stat *sb)
return 1; /* finish xftw */
}
}
- next:
+ next: ;
}
if (npaths > 0)
diff --git a/mdk-stage1/insmod-modutils/util/modstat.c b/mdk-stage1/insmod-modutils/util/modstat.c
index ad82306c0..142b5ba49 100644
--- a/mdk-stage1/insmod-modutils/util/modstat.c
+++ b/mdk-stage1/insmod-modutils/util/modstat.c
@@ -199,7 +199,7 @@ static int new_get_kernel_info(int type)
for (j = 0, s = syms; j < nsyms; ++j, ++s)
s->name += (unsigned long) syms;
}
- next:
+ next: ;
}
if (type & K_SYMBOLS) { /* Want info about symbols */