summaryrefslogtreecommitdiffstats
path: root/sbin
diff options
context:
space:
mode:
authorstefanf <stefanf@FreeBSD.org>2005-04-08 21:37:41 +0000
committerstefanf <stefanf@FreeBSD.org>2005-04-08 21:37:41 +0000
commit93dc7c672e88559f4ae90f91fdc693a94c8d940a (patch)
tree39cc60bda0148cb9e6312957cf961874d809c280 /sbin
parent2bd54b55a67f0891a12f690b4014bf1e5f4e5c90 (diff)
downloadFreeBSD-src-93dc7c672e88559f4ae90f91fdc693a94c8d940a.zip
FreeBSD-src-93dc7c672e88559f4ae90f91fdc693a94c8d940a.tar.gz
ISO C does not allow unnamed union members.
Diffstat (limited to 'sbin')
-rw-r--r--sbin/ifconfig/ifconfig.c10
-rw-r--r--sbin/ifconfig/ifconfig.h2
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index eef77ec..b95a7a5 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -502,25 +502,25 @@ ifconfig(int argc, char *const *argv, const struct afswtch *afp)
*/
p = (setaddr ? &setifdstaddr_cmd : &setifaddr_cmd);
}
- if (p->c_func || p->c_func2) {
+ if (p->c_u.c_func || p->c_u.c_func2) {
if (p->c_parameter == NEXTARG) {
if (argv[1] == NULL)
errx(1, "'%s' requires argument",
p->c_name);
- p->c_func(argv[1], 0, s, afp);
+ p->c_u.c_func(argv[1], 0, s, afp);
argc--, argv++;
} else if (p->c_parameter == OPTARG) {
- p->c_func(argv[1], 0, s, afp);
+ p->c_u.c_func(argv[1], 0, s, afp);
if (argv[1] != NULL)
argc--, argv++;
} else if (p->c_parameter == NEXTARG2) {
if (argc < 3)
errx(1, "'%s' requires 2 arguments",
p->c_name);
- p->c_func2(argv[1], argv[2], s, afp);
+ p->c_u.c_func2(argv[1], argv[2], s, afp);
argc -= 2, argv += 2;
} else
- p->c_func(*argv, p->c_parameter, s, afp);
+ p->c_u.c_func(*argv, p->c_parameter, s, afp);
}
argc--, argv++;
}
diff --git a/sbin/ifconfig/ifconfig.h b/sbin/ifconfig/ifconfig.h
index d57517c..505d8b1 100644
--- a/sbin/ifconfig/ifconfig.h
+++ b/sbin/ifconfig/ifconfig.h
@@ -51,7 +51,7 @@ struct cmd {
union {
c_func *c_func;
c_func2 *c_func2;
- };
+ } c_u;
struct cmd *c_next;
};
void cmd_register(struct cmd *);
OpenPOWER on IntegriCloud