Browse Source

clang: get the last easy errors out of the way

Signed-off-by: Ronald G. Minnich <rminnich@gmail.com>
Ronald G. Minnich 8 years ago
parent
commit
6d4d089150

+ 15 - 15
sys/src/9/amd64/qmalloc.c

@@ -81,21 +81,21 @@ enum
 static	void	qfreeinternal(void*);
 static	int	qstats[QSmax];
 static	char*	qstatstr[QSmax] = {
-[QSmalign]		"malign",
-[QSmalignquick]	"malignquick",
-[QSmalignrover]	"malignrover",
-[QSmalignfront]	"malignfront",
-[QSmalignback]	"malignback",
-[QSmaligntail]	"maligntail",
-[QSmalignnottail]	"malignnottail",
-[QSmalloc]		"malloc",
-[QSmallocrover]	"mallocrover",
-[QSmalloctail]	"malloctail",
-[QSfree]		"free",
-[QSfreetail]	"freetail",
-[QSfreequick]	"freequick",
-[QSfreenext]	"freenext",
-[QSfreeprev]	"freeprev",
+[QSmalign] = "malign",
+[QSmalignquick] = "malignquick",
+[QSmalignrover] = "malignrover",
+[QSmalignfront] = "malignfront",
+[QSmalignback] = "malignback",
+[QSmaligntail] = "maligntail",
+[QSmalignnottail] = "malignnottail",
+[QSmalloc] = "malloc",
+[QSmallocrover] = "mallocrover",
+[QSmalloctail] = "malloctail",
+[QSfree] = "free",
+[QSfreetail] = "freetail",
+[QSfreequick] = "freequick",
+[QSfreenext] = "freenext",
+[QSfreeprev] = "freeprev",
 };
 
 static	Lock		mainlock;

+ 8 - 8
sys/src/9/amd64/sdata.c

@@ -1370,14 +1370,14 @@ atapktio(Drive* drive, uint8_t* cmd, int clen)
 }
 
 static uint8_t cmd48[256] = {
-	[Crs]	Crs48,
-	[Crd]	Crd48,
-	[Crdq]	Crdq48,
-	[Crsm]	Crsm48,
-	[Cws]	Cws48,
-	[Cwd]	Cwd48,
-	[Cwdq]	Cwdq48,
-	[Cwsm]	Cwsm48,
+	[Crs] =	Crs48,
+	[Crd] =	Crd48,
+	[Crdq] =	Crdq48,
+	[Crsm] =	Crsm48,
+	[Cws] =	Cws48,
+	[Cwd] =	Cwd48,
+	[Cwdq] =	Cwdq48,
+	[Cwsm] =	Cwsm48,
 };
 
 static int

+ 1 - 1
sys/src/9/amd64/usbohci.c

@@ -393,7 +393,7 @@ static char* errmsgs[] =
 [Tdcrc] = "crc error",
 [Tdbitstuff] = "bit stuffing error",
 [Tdbadtog] = "bad toggle",
-[Tdstalled]	Estalled,
+[Tdstalled] = 	Estalled,
 [Tdtmout] = "timeout error",
 [Tdpidchk] = "pid check error",
 [Tdbadpid] = "bad pid",

+ 25 - 25
sys/src/9/ip/icmp.c

@@ -60,19 +60,19 @@ enum
 
 char *icmpnames[Maxtype+1] =
 {
-[EchoReply]		"EchoReply",
-[Unreachable]		"Unreachable",
-[SrcQuench]		"SrcQuench",
-[Redirect]		"Redirect",
-[EchoRequest]		"EchoRequest",
-[TimeExceed]		"TimeExceed",
-[InParmProblem]		"InParmProblem",
-[Timestamp]		"Timestamp",
-[TimestampReply]	"TimestampReply",
-[InfoRequest]		"InfoRequest",
-[InfoReply]		"InfoReply",
-[AddrMaskRequest]	"AddrMaskRequest",
-[AddrMaskReply  ]	"AddrMaskReply  ",
+[EchoReply] = "EchoReply",
+[Unreachable] = "Unreachable",
+[SrcQuench] = "SrcQuench",
+[Redirect] = "Redirect",
+[EchoRequest] = "EchoRequest",
+[TimeExceed] = "TimeExceed",
+[InParmProblem] = "InParmProblem",
+[Timestamp] = "Timestamp",
+[TimestampReply] = "TimestampReply",
+[InfoRequest] = "InfoRequest",
+[InfoReply] = "InfoReply",
+[AddrMaskRequest] = "AddrMaskRequest",
+[AddrMaskReply  ] = "AddrMaskReply  ",
 };
 
 enum {
@@ -95,12 +95,12 @@ enum
 
 static char *statnames[Nstats] =
 {
-[InMsgs]	"InMsgs",
-[InErrors]	"InErrors",
-[OutMsgs]	"OutMsgs",
-[CsumErrs]	"CsumErrs",
-[LenErrs]	"LenErrs",
-[HlenErrs]	"HlenErrs",
+[InMsgs] = "InMsgs",
+[InErrors] = "InErrors",
+[OutMsgs] = "OutMsgs",
+[CsumErrs] = "CsumErrs",
+[LenErrs] = "LenErrs",
+[HlenErrs] = "HlenErrs",
 };
 
 typedef struct Icmppriv Icmppriv;
@@ -321,12 +321,12 @@ mkechoreply(Block *bp)
 
 static char *unreachcode[] =
 {
-[0]	"net unreachable",
-[1]	"host unreachable",
-[2]	"protocol unreachable",
-[3]	"port unreachable",
-[4]	"fragmentation needed and DF set",
-[5]	"source route failed",
+[0] = "net unreachable",
+[1] = "host unreachable",
+[2] = "protocol unreachable",
+[3] = "port unreachable",
+[4] = "fragmentation needed and DF set",
+[5] = "source route failed",
 };
 
 static void

+ 19 - 19
sys/src/9/ip/ip.c

@@ -20,25 +20,25 @@
 
 static char *statnames[] =
 {
-[Forwarding]	"Forwarding",
-[DefaultTTL]	"DefaultTTL",
-[InReceives]	"InReceives",
-[InHdrErrors]	"InHdrErrors",
-[InAddrErrors]	"InAddrErrors",
-[ForwDatagrams]	"ForwDatagrams",
-[InUnknownProtos]	"InUnknownProtos",
-[InDiscards]	"InDiscards",
-[InDelivers]	"InDelivers",
-[OutRequests]	"OutRequests",
-[OutDiscards]	"OutDiscards",
-[OutNoRoutes]	"OutNoRoutes",
-[ReasmTimeout]	"ReasmTimeout",
-[ReasmReqds]	"ReasmReqds",
-[ReasmOKs]	"ReasmOKs",
-[ReasmFails]	"ReasmFails",
-[FragOKs]	"FragOKs",
-[FragFails]	"FragFails",
-[FragCreates]	"FragCreates",
+[Forwarding] = "Forwarding",
+[DefaultTTL] = "DefaultTTL",
+[InReceives] = "InReceives",
+[InHdrErrors] = "InHdrErrors",
+[InAddrErrors] = "InAddrErrors",
+[ForwDatagrams] = "ForwDatagrams",
+[InUnknownProtos] = "InUnknownProtos",
+[InDiscards] = "InDiscards",
+[InDelivers] = "InDelivers",
+[OutRequests] = "OutRequests",
+[OutDiscards] = "OutDiscards",
+[OutNoRoutes] = "OutNoRoutes",
+[ReasmTimeout] = "ReasmTimeout",
+[ReasmReqds] = "ReasmReqds",
+[ReasmOKs] = "ReasmOKs",
+[ReasmFails] = "ReasmFails",
+[FragOKs] = "FragOKs",
+[FragFails] = "FragFails",
+[FragCreates] = "FragCreates",
 };
 
 #define BLKIP(xp)	((Ip4hdr*)((xp)->rp))

+ 20 - 20
sys/src/9/ip/ipaux.c

@@ -18,26 +18,26 @@
 
 char *v6hdrtypes[Maxhdrtype] =
 {
-	[HBH]		"HopbyHop",
-	[ICMP]		"ICMP",
-	[IGMP]		"IGMP",
-	[GGP]		"GGP",
-	[IPINIP]	"IP",
-	[ST]		"ST",
-	[TCP]		"TCP",
-	[UDP]		"UDP",
-	[ISO_TP4]	"ISO_TP4",
-	[RH]		"Routinghdr",
-	[FH]		"Fraghdr",
-	[IDRP]		"IDRP",
-	[RSVP]		"RSVP",
-	[AH]		"Authhdr",
-	[ESP]		"ESP",
-	[ICMPv6]	"ICMPv6",
-	[NNH]		"Nonexthdr",
-	[ISO_IP]	"ISO_IP",
-	[IGRP]		"IGRP",
-	[OSPF]		"OSPF",
+	[HBH] = "HopbyHop",
+	[ICMP] = "ICMP",
+	[IGMP] = "IGMP",
+	[GGP] = "GGP",
+	[IPINIP] = "IP",
+	[ST] = "ST",
+	[TCP] = "TCP",
+	[UDP] = "UDP",
+	[ISO_TP4] = "ISO_TP4",
+	[RH] = "Routinghdr",
+	[FH] = "Fraghdr",
+	[IDRP] = "IDRP",
+	[RSVP] = "RSVP",
+	[AH] = "Authhdr",
+	[ESP] = "ESP",
+	[ICMPv6] = "ICMPv6",
+	[NNH] = "Nonexthdr",
+	[ISO_IP] = "ISO_IP",
+	[IGRP] = "IGRP",
+	[OSPF] = "OSPF",
 };
 
 /*

+ 30 - 30
sys/src/9/ip/tcp.c

@@ -356,36 +356,36 @@ enum {
 
 static char *statnames[Nstats] =
 {
-[MaxConn]	"MaxConn",
-[Mss]		"MaxSegment",
-[ActiveOpens]	"ActiveOpens",
-[PassiveOpens]	"PassiveOpens",
-[EstabResets]	"EstabResets",
-[CurrEstab]	"CurrEstab",
-[InSegs]	"InSegs",
-[OutSegs]	"OutSegs",
-[RetransSegs]	"RetransSegs",
-[RetransSegsSent]	"RetransSegsSent",
-[RetransTimeouts]	"RetransTimeouts",
-[InErrs]	"InErrs",
-[OutRsts]	"OutRsts",
-[CsumErrs]	"CsumErrs",
-[HlenErrs]	"HlenErrs",
-[LenErrs]	"LenErrs",
-[OutOfOrder]	"OutOfOrder",
-[Resequenced]	"Resequenced",
-[ReseqBytelim]	"ReseqBytelim",
-[ReseqPktlim]	"ReseqPktlim",
-[Delayack]	"Delayack",
-[Wopenack]	"Wopenack",
-
-[Recovery]	"Recovery",
-[RecoveryDone]	"RecoveryDone",
-[RecoveryRTO]	"RecoveryRTO",
-
-[RecoveryNoSeq]	"RecoveryNoSeq",
-[RecoveryCwind]	"RecoveryCwind",
-[RecoveryPA]	"RecoveryPA",
+[MaxConn] = "MaxConn",
+[Mss] = "MaxSegment",
+[ActiveOpens] = "ActiveOpens",
+[PassiveOpens] = "PassiveOpens",
+[EstabResets] = "EstabResets",
+[CurrEstab] = "CurrEstab",
+[InSegs] = "InSegs",
+[OutSegs] = "OutSegs",
+[RetransSegs] = "RetransSegs",
+[RetransSegsSent] = "RetransSegsSent",
+[RetransTimeouts] = "RetransTimeouts",
+[InErrs] = "InErrs",
+[OutRsts] = "OutRsts",
+[CsumErrs] = "CsumErrs",
+[HlenErrs] = "HlenErrs",
+[LenErrs] = "LenErrs",
+[OutOfOrder] = "OutOfOrder",
+[Resequenced] = "Resequenced",
+[ReseqBytelim] = "ReseqBytelim",
+[ReseqPktlim] = "ReseqPktlim",
+[Delayack] = "Delayack",
+[Wopenack] = "Wopenack",
+
+[Recovery] = "Recovery",
+[RecoveryDone] = "RecoveryDone",
+[RecoveryRTO] = "RecoveryRTO",
+
+[RecoveryNoSeq] = "RecoveryNoSeq",
+[RecoveryCwind] = "RecoveryCwind",
+[RecoveryPA] = "RecoveryPA",
 };
 
 typedef struct Tcppriv Tcppriv;

+ 7 - 7
sys/src/9/port/devssl.c

@@ -123,13 +123,13 @@ static void	dsnew(Chan *c, Dstate **);
 static int32_t	sslput(Dstate *s, Block * volatile b);
 
 char *sslnames[] = {
-[Qclonus]	"clone",
-[Qdata]		"data",
-[Qctl]		"ctl",
-[Qsecretin]	"secretin",
-[Qsecretout]	"secretout",
-[Qencalgs]	"encalgs",
-[Qhashalgs]	"hashalgs",
+[Qclonus] = "clone",
+[Qdata] = "data",
+[Qctl] = "ctl",
+[Qsecretin] = "secretin",
+[Qsecretout] = "secretout",
+[Qencalgs] = "encalgs",
+[Qhashalgs] = "hashalgs",
 };
 
 static int

+ 8 - 8
sys/src/9/port/devtls.c

@@ -264,14 +264,14 @@ static void	pdump(int, void*, char*);
 #pragma	varargck	argpos	rcvError	3
 
 static char *tlsnames[] = {
-[Qclonus]		"clone",
-[Qencalgs]	"encalgs",
-[Qhashalgs]	"hashalgs",
-[Qdata]		"data",
-[Qctl]		"ctl",
-[Qhand]		"hand",
-[Qstatus]		"status",
-[Qstats]		"stats",
+[Qclonus] = "clone",
+[Qencalgs] = "encalgs",
+[Qhashalgs] = "hashalgs",
+[Qdata] = "data",
+[Qctl] = "ctl",
+[Qhand] = "hand",
+[Qstatus] = "status",
+[Qstats] = "stats",
 };
 
 static int convdir[] = { Qctl, Qdata, Qhand, Qstatus, Qstats };

+ 3 - 3
sys/src/9/port/devws.c

@@ -50,9 +50,9 @@ collect(void)
 	char *buf, *s;
 	int i, n;
 	static char *wname[] = {
-	[WSlock] "lock",
-	[WSqlock] "qlock",
-	[WSslock] "slock",
+	[WSlock] = "lock",
+	[WSqlock] = "qlock",
+	[WSslock] = "slock",
 	};
 
 	n = waitstats.npcs * (strlen("slock") + 1 + 19 * 3 + 1) + 1;