code review 4633043: 8l/ld: Further adjustments for a port of Go to Plan 9 n...

src/cmd/ld/data.c

Index: src/cmd/ld/data.c
===================================================================
--- a/src/cmd/ld/data.c
+++ b/src/cmd/ld/data.c
@@ -482,13 +482,13 @@
 			q = sym->p;
 			
 			while(n >= 16) {
-				Bprint(&bso, "%.6ux\t%-20.16I\n",  addr, q);
+				Bprint(&bso, "%.6ux\t%-20.16I\n", addr, q);
 				addr += 16;
 				q += 16;
 				n -= 16;
 			}
 			if(n > 0)
-				Bprint(&bso, "%.6ux\t%-20.*I\n", addr, n, q);
+				Bprint(&bso, "%.6ux\t%-20.*I\n", addr, (int)n, q);
 			addr += n;
 			continue;
 		}
@@ -502,7 +502,7 @@
 			Bprint(&bso, "%.6ux\t", p->pc);
 			q = sym->p + p->pc - sym->value;
 			n = epc - p->pc;
-			Bprint(&bso, "%-20.*I | %P\n", n, q, p);
+			Bprint(&bso, "%-20.*I | %P\n", (int)n, q, p);
 			addr += n;
 		}
 	}
@@ -543,7 +543,7 @@
 			Bprint(&bso, "%-20s %.8ux| 00 ...\n", "(pre-pad)", addr);
 			addr = sym->value;
 		}
-		Bprint(&bso, "%-20s %.8ux|", sym->name, addr);
+		Bprint(&bso, "%-20s %.8ux|", sym->name, (uint)addr);
 		p = sym->p;
 		ep = p + sym->np;
 		while(p < ep)
@@ -555,8 +555,8 @@
 	}
 
 	if(addr < eaddr)
-		Bprint(&bso, "%-20s %.8ux| 00 ...\n", "(post-pad)", addr);
-	Bprint(&bso, "%-20s %.8ux|\n", "", eaddr);
+		Bprint(&bso, "%-20s %.8ux| 00 ...\n", "(post-pad)", (uint)addr);
+	Bprint(&bso, "%-20s %.8ux|\n", "", (uint)eaddr);
 }
 
 void
@@ -808,9 +808,9 @@
 			t = rnd(t, PtrSize);
 		else if(t > 2)
 			t = rnd(t, 4);
-		if(t & 1)
+		if(t & 1) {
 			;
-		else if(t & 2)
+		} else if(t & 2)
 			datsize = rnd(datsize, 2);
 		else if(t & 4)
 			datsize = rnd(datsize, 4);
@@ -834,9 +834,9 @@
 			t = rnd(t, PtrSize);
 		else if(t > 2)
 			t = rnd(t, 4);
-		if(t & 1)
+		if(t & 1) {
 			;
-		else if(t & 2)
+		} else if(t & 2)
 			datsize = rnd(datsize, 2);
 		else if(t & 4)
 			datsize = rnd(datsize, 4);