svn commit: r194799 - head/sbin/ifconfig
Xin LI
delphij at FreeBSD.org
Tue Jun 23 23:49:52 UTC 2009
Author: delphij
Date: Tue Jun 23 23:49:52 2009
New Revision: 194799
URL: http://svn.freebsd.org/changeset/base/194799
Log:
- Use size_t instead of int when appropriate;
- Use C99 sparse initialization.
With these changes ifconfig(8) is WARNS=2 clean.
Modified:
head/sbin/ifconfig/af_atalk.c
head/sbin/ifconfig/af_inet.c
head/sbin/ifconfig/af_inet6.c
head/sbin/ifconfig/ifclone.c
head/sbin/ifconfig/ifconfig.c
head/sbin/ifconfig/ifconfig.h
head/sbin/ifconfig/ifgif.c
head/sbin/ifconfig/ifgre.c
head/sbin/ifconfig/ifmac.c
head/sbin/ifconfig/ifmedia.c
head/sbin/ifconfig/ifvlan.c
Modified: head/sbin/ifconfig/af_atalk.c
==============================================================================
--- head/sbin/ifconfig/af_atalk.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/af_atalk.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -173,7 +173,7 @@ static __constructor void
atalk_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(atalk_cmds); i++)
cmd_register(&atalk_cmds[i]);
Modified: head/sbin/ifconfig/af_inet.c
==============================================================================
--- head/sbin/ifconfig/af_inet.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/af_inet.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -130,7 +130,7 @@ in_getaddr(const char *s, int which)
return;
if ((hp = gethostbyname(s)) != 0)
bcopy(hp->h_addr, (char *)&sin->sin_addr,
- MIN(hp->h_length, sizeof(sin->sin_addr)));
+ MIN((size_t)hp->h_length, sizeof(sin->sin_addr)));
else if ((np = getnetbyname(s)) != 0)
sin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
else
Modified: head/sbin/ifconfig/af_inet6.c
==============================================================================
--- head/sbin/ifconfig/af_inet6.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/af_inet6.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -58,12 +58,8 @@ static const char rcsid[] =
static struct in6_ifreq in6_ridreq;
static struct in6_aliasreq in6_addreq =
- { { 0 },
- { 0 },
- { 0 },
- { 0 },
- 0,
- { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } };
+ { .ifra_flags = 0,
+ .ifra_lifetime = { 0, 0, ND6_INFINITE_LIFETIME, ND6_INFINITE_LIFETIME } };
static int ip6lifetime;
static void in6_fillscopeid(struct sockaddr_in6 *sin6);
@@ -522,13 +518,13 @@ in6_Lopt_cb(const char *optarg __unused)
{
ip6lifetime++; /* print IPv6 address lifetime */
}
-static struct option in6_Lopt = { "L", "[-L]", in6_Lopt_cb };
+static struct option in6_Lopt = { .opt = "L", .opt_usage = "[-L]", .cb = in6_Lopt_cb };
static __constructor void
inet6_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(inet6_cmds); i++)
cmd_register(&inet6_cmds[i]);
Modified: head/sbin/ifconfig/ifclone.c
==============================================================================
--- head/sbin/ifconfig/ifclone.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifclone.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -179,13 +179,13 @@ clone_Copt_cb(const char *optarg __unuse
list_cloners();
exit(0);
}
-static struct option clone_Copt = { "C", "[-C]", clone_Copt_cb };
+static struct option clone_Copt = { .opt = "C", .opt_usage = "[-C]", .cb = clone_Copt_cb };
static __constructor void
clone_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(clone_cmds); i++)
cmd_register(&clone_cmds[i]);
Modified: head/sbin/ifconfig/ifconfig.c
==============================================================================
--- head/sbin/ifconfig/ifconfig.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifconfig.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -1053,7 +1053,7 @@ static __constructor void
ifconfig_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(basic_cmds); i++)
cmd_register(&basic_cmds[i]);
Modified: head/sbin/ifconfig/ifconfig.h
==============================================================================
--- head/sbin/ifconfig/ifconfig.h Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifconfig.h Tue Jun 23 23:49:52 2009 (r194799)
@@ -68,12 +68,12 @@ void callback_register(callback_func *,
#define DECL_CMD_FUNC2(name, arg1, arg2) \
void name(const char *arg1, const char *arg2, int s, const struct afswtch *afp)
-#define DEF_CMD(name, param, func) { name, param, { .c_func = func } }
-#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func } }
-#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func } }
-#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func } }
-#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1 }
-#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1 }
+#define DEF_CMD(name, param, func) { name, param, { .c_func = func }, 0, NULL }
+#define DEF_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 0, NULL }
+#define DEF_CMD_OPTARG(name, func) { name, OPTARG, { .c_func = func }, 0, NULL }
+#define DEF_CMD_ARG2(name, func) { name, NEXTARG2, { .c_func2 = func }, 0, NULL }
+#define DEF_CLONE_CMD(name, param, func) { name, param, { .c_func = func }, 1, NULL }
+#define DEF_CLONE_CMD_ARG(name, func) { name, NEXTARG, { .c_func = func }, 1, NULL }
struct ifaddrs;
struct addrinfo;
Modified: head/sbin/ifconfig/ifgif.c
==============================================================================
--- head/sbin/ifconfig/ifgif.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifgif.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -66,7 +66,7 @@ gif_status(int s)
{
int opts;
int nopts = 0;
- int i;
+ size_t i;
ifr.ifr_data = (caddr_t)&opts;
if (ioctl(s, GIFGOPTS, &ifr) == -1)
@@ -123,7 +123,7 @@ static __constructor void
gif_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(gif_cmds); i++)
cmd_register(&gif_cmds[i]);
Modified: head/sbin/ifconfig/ifgre.c
==============================================================================
--- head/sbin/ifconfig/ifgre.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifgre.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -89,7 +89,7 @@ static __constructor void
gre_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(gre_cmds); i++)
cmd_register(&gre_cmds[i]);
Modified: head/sbin/ifconfig/ifmac.c
==============================================================================
--- head/sbin/ifconfig/ifmac.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifmac.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -112,7 +112,7 @@ static __constructor void
mac_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(mac_cmds); i++)
cmd_register(&mac_cmds[i]);
Modified: head/sbin/ifconfig/ifmedia.c
==============================================================================
--- head/sbin/ifconfig/ifmedia.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifmedia.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -330,7 +330,7 @@ setmediainst(const char *val, int d, int
ifmr = ifmedia_getstate(s);
inst = atoi(val);
- if (inst < 0 || inst > IFM_INST_MAX)
+ if (inst < 0 || inst > (int)IFM_INST_MAX)
errx(1, "invalid media instance: %s", val);
strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
@@ -822,7 +822,7 @@ static __constructor void
ifmedia_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(media_cmds); i++)
cmd_register(&media_cmds[i]);
Modified: head/sbin/ifconfig/ifvlan.c
==============================================================================
--- head/sbin/ifconfig/ifvlan.c Tue Jun 23 23:37:25 2009 (r194798)
+++ head/sbin/ifconfig/ifvlan.c Tue Jun 23 23:49:52 2009 (r194799)
@@ -192,7 +192,7 @@ static __constructor void
vlan_ctor(void)
{
#define N(a) (sizeof(a) / sizeof(a[0]))
- int i;
+ size_t i;
for (i = 0; i < N(vlan_cmds); i++)
cmd_register(&vlan_cmds[i]);
More information about the svn-src-head
mailing list