Browse Source

ipconfig: fix clang warnings

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 7 years ago
parent
commit
b1490086b3
2 changed files with 119 additions and 119 deletions
  1. 33 33
      sys/src/cmd/ip/ipconfig/ipv6.c
  2. 86 86
      sys/src/cmd/ip/ipconfig/main.c

+ 33 - 33
sys/src/cmd/ip/ipconfig/ipv6.c

@@ -43,43 +43,43 @@ struct Hdr			/* ICMP v4 & v6 header */
 
 char *icmpmsg6[Maxtype6+1] =
 {
-[EchoReply]		"EchoReply",
-[UnreachableV6]		"UnreachableV6",
-[PacketTooBigV6]	"PacketTooBigV6",
-[TimeExceedV6]		"TimeExceedV6",
-[Redirect]		"Redirect",
-[EchoRequest]		"EchoRequest",
-[TimeExceed]		"TimeExceed",
-[InParmProblem]		"InParmProblem",
-[Timestamp]		"Timestamp",
-[TimestampReply]	"TimestampReply",
-[InfoRequest]		"InfoRequest",
-[InfoReply]		"InfoReply",
-[AddrMaskRequest]	"AddrMaskRequest",
-[AddrMaskReply]		"AddrMaskReply",
-[EchoRequestV6]		"EchoRequestV6",
-[EchoReplyV6]		"EchoReplyV6",
-[RouterSolicit]		"RouterSolicit",
-[RouterAdvert]		"RouterAdvert",
-[NbrSolicit]		"NbrSolicit",
-[NbrAdvert]		"NbrAdvert",
-[RedirectV6]		"RedirectV6",
+[EchoReply] =		"EchoReply",
+[UnreachableV6] =		"UnreachableV6",
+[PacketTooBigV6] =	"PacketTooBigV6",
+[TimeExceedV6] =		"TimeExceedV6",
+[Redirect] =		"Redirect",
+[EchoRequest] =		"EchoRequest",
+[TimeExceed] =		"TimeExceed",
+[InParmProblem] =		"InParmProblem",
+[Timestamp] =		"Timestamp",
+[TimestampReply] =	"TimestampReply",
+[InfoRequest] =		"InfoRequest",
+[InfoReply] =		"InfoReply",
+[AddrMaskRequest] =	"AddrMaskRequest",
+[AddrMaskReply] =		"AddrMaskReply",
+[EchoRequestV6] =		"EchoRequestV6",
+[EchoReplyV6] =		"EchoReplyV6",
+[RouterSolicit] =		"RouterSolicit",
+[RouterAdvert] =		"RouterAdvert",
+[NbrSolicit] =		"NbrSolicit",
+[NbrAdvert] =		"NbrAdvert",
+[RedirectV6] =		"RedirectV6",
 };
 
 static char *icmp6opts[] =
 {
-[0]			"unknown option",
-[V6nd_srclladdr]	"srcll_addr",
-[V6nd_targlladdr]	"targll_addr",
-[V6nd_pfxinfo]		"prefix",
-[V6nd_redirhdr]		"redirect",
-[V6nd_mtu]		"mtu",
-[V6nd_home]		"home",
-[V6nd_srcaddrs]		"src_addrs",
-[V6nd_ip]		"ip",
-[V6nd_rdns]		"rdns",
-[V6nd_9fs]		"9fs",
-[V6nd_9auth]		"9auth",
+[0] =			"unknown option",
+[V6nd_srclladdr] =	"srcll_addr",
+[V6nd_targlladdr] =	"targll_addr",
+[V6nd_pfxinfo] =		"prefix",
+[V6nd_redirhdr] =		"redirect",
+[V6nd_mtu] =		"mtu",
+[V6nd_home] =		"home",
+[V6nd_srcaddrs] =		"src_addrs",
+[V6nd_ip] =		"ip",
+[V6nd_rdns] =		"rdns",
+[V6nd_9fs] =		"9fs",
+[V6nd_9auth] =		"9auth",
 };
 
 uint8_t v6allroutersL[IPaddrlen] = {

+ 86 - 86
sys/src/cmd/ip/ipconfig/main.c

@@ -63,80 +63,80 @@ struct Option
  */
 Option option[256] =
 {
-[OBmask]		{ "ipmask",		Taddr },
-[OBtimeoff]		{ "timeoff",		Tulong },
-[OBrouter]		{ "ipgw",		Taddrs },
-[OBtimeserver]		{ "time",		Taddrs },
-[OBnameserver]		{ "name",		Taddrs },
-[OBdnserver]		{ "dns",		Taddrs },
-[OBlogserver]		{ "log",		Taddrs },
-[OBcookieserver]	{ "cookie",		Taddrs },
-[OBlprserver]		{ "lpr",		Taddrs },
-[OBimpressserver]	{ "impress",		Taddrs },
-[OBrlserver]		{ "rl",			Taddrs },
-[OBhostname]		{ "sys",		Tstr },
-[OBbflen]		{ "bflen",		Tulong },
-[OBdumpfile]		{ "dumpfile",		Tstr },
-[OBdomainname]		{ "dom",		Tstr },
-[OBswapserver]		{ "swap",		Taddrs },
-[OBrootpath]		{ "rootpath",		Tstr },
-[OBextpath]		{ "extpath",		Tstr },
-[OBipforward]		{ "ipforward",		Taddrs },
-[OBnonlocal]		{ "nonlocal",		Taddrs },
-[OBpolicyfilter]	{ "policyfilter",	Taddrs },
-[OBmaxdatagram]		{ "maxdatagram",	Tulong },
-[OBttl]			{ "ttl",		Tulong },
-[OBpathtimeout]		{ "pathtimeout",	Taddrs },
-[OBpathplateau]		{ "pathplateau",	Taddrs },
-[OBmtu]			{ "mtu",		Tulong },
-[OBsubnetslocal]	{ "subnetslocal",	Taddrs },
-[OBbaddr]		{ "baddr",		Taddrs },
-[OBdiscovermask]	{ "discovermask",	Taddrs },
-[OBsupplymask]		{ "supplymask",		Taddrs },
-[OBdiscoverrouter]	{ "discoverrouter",	Taddrs },
-[OBrsserver]		{ "rs",			Taddrs },
-[OBstaticroutes]	{ "staticroutes",	Taddrs },
-[OBtrailerencap]	{ "trailerencap",	Taddrs },
-[OBarptimeout]		{ "arptimeout",		Tulong },
-[OBetherencap]		{ "etherencap",		Taddrs },
-[OBtcpttl]		{ "tcpttl",		Tulong },
-[OBtcpka]		{ "tcpka",		Tulong },
-[OBtcpkag]		{ "tcpkag",		Tulong },
-[OBnisdomain]		{ "nisdomain",		Tstr },
-[OBniserver]		{ "ni",			Taddrs },
-[OBntpserver]		{ "ntp",		Taddrs },
-[OBnetbiosns]		{ "netbiosns",		Taddrs },
-[OBnetbiosdds]		{ "netbiosdds",		Taddrs },
-[OBnetbiostype]		{ "netbiostype",	Taddrs },
-[OBnetbiosscope]	{ "netbiosscope",	Taddrs },
-[OBxfontserver]		{ "xfont",		Taddrs },
-[OBxdispmanager]	{ "xdispmanager",	Taddrs },
-[OBnisplusdomain]	{ "nisplusdomain",	Tstr },
-[OBnisplusserver]	{ "nisplus",		Taddrs },
-[OBhomeagent]		{ "homeagent",		Taddrs },
-[OBsmtpserver]		{ "smtp",		Taddrs },
-[OBpop3server]		{ "pop3",		Taddrs },
-[OBnntpserver]		{ "nntp",		Taddrs },
-[OBwwwserver]		{ "www",		Taddrs },
-[OBfingerserver]	{ "finger",		Taddrs },
-[OBircserver]		{ "irc",		Taddrs },
-[OBstserver]		{ "st",			Taddrs },
-[OBstdaserver]		{ "stdar",		Taddrs },
-
-[ODipaddr]		{ "ipaddr",		Taddr },
-[ODlease]		{ "lease",		Tulong },
-[ODoverload]		{ "overload",		Taddr },
-[ODtype]		{ "type",		Tbyte },
-[ODserverid]		{ "serverid",		Taddr },
-[ODparams]		{ "params",		Tvec },
-[ODmessage]		{ "message",		Tstr },
-[ODmaxmsg]		{ "maxmsg",		Tulong },
-[ODrenewaltime]		{ "renewaltime",	Tulong },
-[ODrebindingtime]	{ "rebindingtime",	Tulong },
-[ODvendorclass]		{ "vendorclass",	Tvec },
-[ODclientid]		{ "clientid",		Tvec },
-[ODtftpserver]		{ "tftp",		Taddr },
-[ODbootfile]		{ "bootfile",		Tstr },
+[OBmask] =		{ "ipmask",		Taddr },
+[OBtimeoff] =		{ "timeoff",		Tulong },
+[OBrouter] =		{ "ipgw",		Taddrs },
+[OBtimeserver] =		{ "time",		Taddrs },
+[OBnameserver] =		{ "name",		Taddrs },
+[OBdnserver] =		{ "dns",		Taddrs },
+[OBlogserver] =		{ "log",		Taddrs },
+[OBcookieserver] =	{ "cookie",		Taddrs },
+[OBlprserver] =		{ "lpr",		Taddrs },
+[OBimpressserver] =	{ "impress",		Taddrs },
+[OBrlserver] =		{ "rl",			Taddrs },
+[OBhostname] =		{ "sys",		Tstr },
+[OBbflen] =		{ "bflen",		Tulong },
+[OBdumpfile] =		{ "dumpfile",		Tstr },
+[OBdomainname] =		{ "dom",		Tstr },
+[OBswapserver] =		{ "swap",		Taddrs },
+[OBrootpath] =		{ "rootpath",		Tstr },
+[OBextpath] =		{ "extpath",		Tstr },
+[OBipforward] =		{ "ipforward",		Taddrs },
+[OBnonlocal] =		{ "nonlocal",		Taddrs },
+[OBpolicyfilter] =	{ "policyfilter",	Taddrs },
+[OBmaxdatagram] =		{ "maxdatagram",	Tulong },
+[OBttl] =			{ "ttl",		Tulong },
+[OBpathtimeout] =		{ "pathtimeout",	Taddrs },
+[OBpathplateau] =		{ "pathplateau",	Taddrs },
+[OBmtu] =			{ "mtu",		Tulong },
+[OBsubnetslocal] =	{ "subnetslocal",	Taddrs },
+[OBbaddr] =		{ "baddr",		Taddrs },
+[OBdiscovermask] =	{ "discovermask",	Taddrs },
+[OBsupplymask] =		{ "supplymask",		Taddrs },
+[OBdiscoverrouter] =	{ "discoverrouter",	Taddrs },
+[OBrsserver] =		{ "rs",			Taddrs },
+[OBstaticroutes] =	{ "staticroutes",	Taddrs },
+[OBtrailerencap] =	{ "trailerencap",	Taddrs },
+[OBarptimeout] =		{ "arptimeout",		Tulong },
+[OBetherencap] =		{ "etherencap",		Taddrs },
+[OBtcpttl] =		{ "tcpttl",		Tulong },
+[OBtcpka] =		{ "tcpka",		Tulong },
+[OBtcpkag] =		{ "tcpkag",		Tulong },
+[OBnisdomain] =		{ "nisdomain",		Tstr },
+[OBniserver] =		{ "ni",			Taddrs },
+[OBntpserver] =		{ "ntp",		Taddrs },
+[OBnetbiosns] =		{ "netbiosns",		Taddrs },
+[OBnetbiosdds] =		{ "netbiosdds",		Taddrs },
+[OBnetbiostype] =		{ "netbiostype",	Taddrs },
+[OBnetbiosscope] =	{ "netbiosscope",	Taddrs },
+[OBxfontserver] =		{ "xfont",		Taddrs },
+[OBxdispmanager] =	{ "xdispmanager",	Taddrs },
+[OBnisplusdomain] =	{ "nisplusdomain",	Tstr },
+[OBnisplusserver] =	{ "nisplus",		Taddrs },
+[OBhomeagent] =		{ "homeagent",		Taddrs },
+[OBsmtpserver] =		{ "smtp",		Taddrs },
+[OBpop3server] =		{ "pop3",		Taddrs },
+[OBnntpserver] =		{ "nntp",		Taddrs },
+[OBwwwserver] =		{ "www",		Taddrs },
+[OBfingerserver] =	{ "finger",		Taddrs },
+[OBircserver] =		{ "irc",		Taddrs },
+[OBstserver] =		{ "st",			Taddrs },
+[OBstdaserver] =		{ "stdar",		Taddrs },
+
+[ODipaddr] =		{ "ipaddr",		Taddr },
+[ODlease] =		{ "lease",		Tulong },
+[ODoverload] =		{ "overload",		Taddr },
+[ODtype] =		{ "type",		Tbyte },
+[ODserverid] =		{ "serverid",		Taddr },
+[ODparams] =		{ "params",		Tvec },
+[ODmessage] =		{ "message",		Tstr },
+[ODmaxmsg] =		{ "maxmsg",		Tulong },
+[ODrenewaltime] =		{ "renewaltime",	Tulong },
+[ODrebindingtime] =	{ "rebindingtime",	Tulong },
+[ODvendorclass] =		{ "vendorclass",	Tvec },
+[ODclientid] =		{ "clientid",		Tvec },
+[ODtftpserver] =		{ "tftp",		Taddr },
+[ODbootfile] =		{ "bootfile",		Tstr },
 };
 
 uint8_t defrequested[] = {
@@ -169,18 +169,18 @@ int	sendhostname;
 static char logfile[] = "ipconfig";
 
 char *verbs[] = {
-[Vadd]		"add",
-[Vremove]	"remove",
-[Vunbind]	"unbind",
-[Vether]	"ether",
-[Vgbe]		"gbe",
-[Vppp]		"ppp",
-[Vloopback]	"loopback",
-[Vaddpref6]	"add6",
-[Vra6]		"ra6",
-[Vtorus]	"torus",
-[Vtree]		"tree",
-[Vpkt]		"pkt",
+[Vadd] =		"add",
+[Vremove] =	"remove",
+[Vunbind] =	"unbind",
+[Vether] =	"ether",
+[Vgbe] =		"gbe",
+[Vppp] =		"ppp",
+[Vloopback] =	"loopback",
+[Vaddpref6] =	"add6",
+[Vra6] =		"ra6",
+[Vtorus] =	"torus",
+[Vtree] =		"tree",
+[Vpkt] =		"pkt",
 };
 
 void	adddefroute(char*, uint8_t*);