Browse Source

clang: down to < 10 errors.

The rest will be hard, some involve assembly.

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

+ 4 - 3
sys/src/9/386/sdiahci.c

@@ -217,10 +217,11 @@ static	int	debug;
 static	int	prid = 1;
 static	int	datapi;
 
+// TODO: does this get initialized correctly? 
 static char stab[] = {
-[0]	'i', 'm',
-[8]	't', 'c', 'p', 'e',
-[16]	'N', 'I', 'W', 'B', 'D', 'C', 'H', 'S', 'T', 'F', 'X'
+[0]	= 'i', 'm',
+[8]	= 't', 'c', 'p', 'e',
+[16]	= 'N', 'I', 'W', 'B', 'D', 'C', 'H', 'S', 'T', 'F', 'X'
 };
 
 static void

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

@@ -79,7 +79,7 @@ vgascreenputc(VGAscr* scr, char* buf, Rectangle *flushr)
 	Rectangle r;
 
 //	drawdebug = 1;
-	if(xp < xbuf || xp >= &xbuf[sizeof(xbuf)])
+	if(xp < xbuf || xp >= &xbuf[sizeof(xbuf)/sizeof(buf[0])])
 		xp = xbuf;
 
 	h = scr->memdefont->height;

+ 3 - 3
sys/src/9/ip/devip.c

@@ -360,9 +360,9 @@ incoming(void* arg)
 }
 
 static int m2p[] = {
-	[OREAD]		4,
-	[OWRITE]	2,
-	[ORDWR]		6
+	[OREAD] =		4,
+	[OWRITE] =	2,
+	[ORDWR]	=	6
 };
 
 static Chan*

+ 42 - 42
sys/src/9/ip/icmp6.c

@@ -134,56 +134,56 @@ typedef struct Icmpcb6
 
 char *icmpnames6[Maxtype6+1] =
 {
-[EchoReply]		"EchoReply",
-[UnreachableV6]		"UnreachableV6",
-[PacketTooBigV6]	"PacketTooBigV6",
-[TimeExceedV6]		"TimeExceedV6",
-[SrcQuench]		"SrcQuench",
-[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",
+[SrcQuench] = "SrcQuench",
+[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 *statnames6[Nstats6] =
 {
-[InMsgs6]	"InMsgs",
-[InErrors6]	"InErrors",
-[OutMsgs6]	"OutMsgs",
-[CsumErrs6]	"CsumErrs",
-[LenErrs6]	"LenErrs",
-[HlenErrs6]	"HlenErrs",
-[HoplimErrs6]	"HoplimErrs",
-[IcmpCodeErrs6]	"IcmpCodeErrs",
-[TargetErrs6]	"TargetErrs",
-[OptlenErrs6]	"OptlenErrs",
-[AddrmxpErrs6]	"AddrmxpErrs",
-[RouterAddrErrs6]	"RouterAddrErrs",
+[InMsgs6] = "InMsgs",
+[InErrors6] = "InErrors",
+[OutMsgs6] = "OutMsgs",
+[CsumErrs6] = "CsumErrs",
+[LenErrs6] = "LenErrs",
+[HlenErrs6] = "HlenErrs",
+[HoplimErrs6] = "HoplimErrs",
+[IcmpCodeErrs6] = "IcmpCodeErrs",
+[TargetErrs6] = "TargetErrs",
+[OptlenErrs6] = "OptlenErrs",
+[AddrmxpErrs6] = "AddrmxpErrs",
+[RouterAddrErrs6] = "RouterAddrErrs",
 };
 
 static char *unreachcode[] =
 {
-[Icmp6_no_route]	"no route to destination",
-[Icmp6_ad_prohib]	"comm with destination administratively prohibited",
-[Icmp6_out_src_scope]	"beyond scope of source address",
-[Icmp6_adr_unreach]	"address unreachable",
-[Icmp6_port_unreach]	"port unreachable",
-[Icmp6_gress_src_fail]	"source address failed ingress/egress policy",
-[Icmp6_rej_route]	"reject route to destination",
-[Icmp6_unknown]		"icmp unreachable: unknown code",
+[Icmp6_no_route] = "no route to destination",
+[Icmp6_ad_prohib] = "comm with destination administratively prohibited",
+[Icmp6_out_src_scope] = "beyond scope of source address",
+[Icmp6_adr_unreach] = "address unreachable",
+[Icmp6_port_unreach] = "port unreachable",
+[Icmp6_gress_src_fail] = "source address failed ingress/egress policy",
+[Icmp6_rej_route] = "reject route to destination",
+[Icmp6_unknown] = "icmp unreachable: unknown code",
 };
 
 static void icmpkick6(void *x, Block *bp);

+ 6 - 6
sys/src/9/ip/ipmux.c

@@ -63,12 +63,12 @@ enum
 
 char *ftname[] =
 {
-[Tproto]	"proto",
-[Tdata]		"data",
-[Tiph]	 	"iph",
-[Tdst]		"dst",
-[Tsrc]		"src",
-[Tifc]		"ifc",
+[Tproto] = "proto",
+[Tdata] = "data",
+[Tiph] = "iph",
+[Tdst] = "dst",
+[Tsrc] = "src",
+[Tifc] = "ifc",
 };
 
 /*

+ 2 - 2
sys/src/9/port/chan.c

@@ -1607,8 +1607,8 @@ char isfrog[256]={
 	/*BKS*/	1, 1, 1, 1, 1, 1, 1, 1,
 	/*DLE*/	1, 1, 1, 1, 1, 1, 1, 1,
 	/*CAN*/	1, 1, 1, 1, 1, 1, 1, 1,
-	['/']	1,
-	[0x7f]	1,
+	['/']	= 1,
+	[0x7f]	= 1,
 };
 
 /*

+ 1 - 1
sys/src/9/port/devcons.c

@@ -757,7 +757,7 @@ conswrite(Chan *c, void *va, int32_t n, int64_t off)
 			rebootcmd(cb->nf-1, cb->f+1);
 			break;
 		case CMpanic:
-			*(uint32_t*)0=0;
+			*(volatile uint32_t*)0=0;
 			panic("/dev/reboot");
 		}
 		poperror();

+ 1 - 1
sys/src/9/port/devmouse.c

@@ -679,7 +679,7 @@ m3mouseputc(Queue *queue, int c)
 int
 m5mouseputc(Queue *queue, int c)
 {
-	static unsigned char msg[3];
+	static unsigned char msg[8];
 	static int nb;
 	static uint32_t lasttick;
 	uint32_t m;

+ 1 - 1
sys/src/9/port/fault.c

@@ -299,7 +299,7 @@ pio(Segment *s, uintptr_t addr, uint32_t soff, Page **p, int color)
 	int n, ask;
 	uintmem pgsz;
 	char *kaddr;
-	uint32_t daddr, doff;
+	uint32_t daddr, doff = 0;
 	Page *loadrec;
 
 	loadrec = *p;