Index: lib/libc/string/memmem.c
===================================================================
--- lib/libc/string/memmem.c
+++ lib/libc/string/memmem.c
@@ -26,29 +26,38 @@
 #include <string.h>
 #include <stdint.h>
 
-static char *twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
+static char *
+twobyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
+
 	for (h++, k--; k; k--, hw = hw<<8 | *++h)
-		if (hw == nw) return (char *)h-1;
+		if (hw == nw)
+			return (char *)h-1;
 	return 0;
 }
 
-static char *threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
+static char *
+threebyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
+
 	for (h+=2, k-=2; k; k--, hw = (hw|*++h)<<8)
-		if (hw == nw) return (char *)h-2;
+		if (hw == nw)
+			return (char *)h-2;
 	return 0;
 }
 
-static char *fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
+static char *
+fourbyte_memmem(const unsigned char *h, size_t k, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
+
 	for (h+=3, k-=3; k; k--, hw = hw<<8 | *++h)
-		if (hw == nw) return (char *)h-3;
+		if (hw == nw)
+			return (char *)h-3;
 	return 0;
 }
 
@@ -66,7 +75,9 @@
  * Reference: CROCHEMORE M., PERRIN D., 1991, Two-way string-matching,
  * Journal of the ACM 38(3):651-675
  */
-static char *twoway_memmem(const unsigned char *h, const unsigned char *z, const unsigned char *n, size_t l)
+static char *
+twoway_memmem(const unsigned char *h, const unsigned char *z,
+    const unsigned char *n, size_t l)
 {
 	size_t i, ip, jp, k, p, ms, p0, mem, mem0;
 	size_t byteset[32 / sizeof(size_t)] = { 0 };
@@ -83,7 +94,8 @@
 			if (k == p) {
 				jp += p;
 				k = 1;
-			} else k++;
+			} else
+				k++;
 		} else if (n[ip+k] > n[jp+k]) {
 			jp += k;
 			k = 1;
@@ -97,7 +109,9 @@
 	p0 = p;
 
 	/* And with the opposite comparison */
-	ip = -1; jp = 0; k = p = 1;
+	ip = -1;
+	jp = 0;
+	k = p = 1;
 	while (jp+k<l) {
 		if (n[ip+k] == n[jp+k]) {
 			if (k == p) {
@@ -113,26 +127,31 @@
 			k = p = 1;
 		}
 	}
-	if (ip+1 > ms+1) ms = ip;
-	else p = p0;
+	if (ip+1 > ms+1)
+		ms = ip;
+	else
+		p = p0;
 
 	/* Periodic needle? */
 	if (memcmp(n, n+p, ms+1)) {
 		mem0 = 0;
 		p = MAX(ms, l-ms-1) + 1;
-	} else mem0 = l-p;
+	} else
+		mem0 = l-p;
 	mem = 0;
 
 	/* Search loop */
 	for (;;) {
 		/* If remainder of haystack is shorter than needle, done */
-		if (z-h < l) return 0;
+		if (z-h < l)
+			return 0;
 
 		/* Check last byte first; advance by shift on mismatch */
 		if (BITOP(byteset, h[l-1], &)) {
 			k = l-shift[h[l-1]];
 			if (k) {
-				if (mem0 && mem && k < p) k = l-p;
+				if (mem0 && mem && k < p)
+					k = l-p;
 				h += k;
 				mem = 0;
 				continue;
@@ -144,21 +163,25 @@
 		}
 
 		/* Compare right half */
-		for (k=MAX(ms+1,mem); k<l && n[k] == h[k]; k++);
+		for (k=MAX(ms+1,mem); k<l && n[k] == h[k]; k++)
+			;
 		if (k < l) {
 			h += k-ms;
 			mem = 0;
 			continue;
 		}
 		/* Compare left half */
-		for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
-		if (k <= mem) return (char *)h;
+		for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--)
+			;
+		if (k <= mem)
+			return (char *)h;
 		h += p;
 		mem = mem0;
 	}
 }
 
-void *memmem(const void *h0, size_t k, const void *n0, size_t l)
+void *
+memmem(const void *h0, size_t k, const void *n0, size_t l)
 {
 	const unsigned char *h = h0, *n = n0;
 
Index: lib/libc/string/strstr.c
===================================================================
--- lib/libc/string/strstr.c
+++ lib/libc/string/strstr.c
@@ -26,26 +26,35 @@
 #include <string.h>
 #include <stdint.h>
 
-static char *twobyte_strstr(const unsigned char *h, const unsigned char *n)
+static char *
+twobyte_strstr(const unsigned char *h, const unsigned char *n)
 {
 	uint16_t nw = n[0]<<8 | n[1], hw = h[0]<<8 | h[1];
-	for (h++; *h && hw != nw; hw = hw<<8 | *++h);
+
+	for (h++; *h && hw != nw; hw = hw<<8 | *++h)
+		;
 	return *h ? (char *)h-1 : 0;
 }
 
-static char *threebyte_strstr(const unsigned char *h, const unsigned char *n)
+static char *
+threebyte_strstr(const unsigned char *h, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8;
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8;
-	for (h+=2; *h && hw != nw; hw = (hw|*++h)<<8);
+
+	for (h+=2; *h && hw != nw; hw = (hw|*++h)<<8)
+		;
 	return *h ? (char *)h-2 : 0;
 }
 
-static char *fourbyte_strstr(const unsigned char *h, const unsigned char *n)
+static char *
+fourbyte_strstr(const unsigned char *h, const unsigned char *n)
 {
 	uint32_t nw = n[0]<<24 | n[1]<<16 | n[2]<<8 | n[3];
 	uint32_t hw = h[0]<<24 | h[1]<<16 | h[2]<<8 | h[3];
-	for (h+=3; *h && hw != nw; hw = hw<<8 | *++h);
+
+	for (h+=3; *h && hw != nw; hw = hw<<8 | *++h)
+		;
 	return *h ? (char *)h-3 : 0;
 }
 
@@ -63,7 +72,8 @@
  * Reference: CROCHEMORE M., PERRIN D., 1991, Two-way string-matching,
  * Journal of the ACM 38(3):651-675
  */
-static char *twoway_strstr(const unsigned char *h, const unsigned char *n)
+static char *
+twoway_strstr(const unsigned char *h, const unsigned char *n)
 {
 	const unsigned char *z;
 	size_t l, ip, jp, k, p, ms, p0, mem, mem0;
@@ -73,16 +83,20 @@
 	/* Computing length of needle and fill shift table */
 	for (l=0; n[l] && h[l]; l++)
 		BITOP(byteset, n[l], |=), shift[n[l]] = l+1;
-	if (n[l]) return 0; /* hit the end of h */
+	if (n[l])
+		return 0; /* hit the end of h */
 
 	/* Compute maximal suffix */
-	ip = -1; jp = 0; k = p = 1;
+	ip = -1;
+	jp = 0;
+	k = p = 1;
 	while (jp+k<l) {
 		if (n[ip+k] == n[jp+k]) {
 			if (k == p) {
 				jp += p;
 				k = 1;
-			} else k++;
+			} else
+				k++;
 		} else if (n[ip+k] > n[jp+k]) {
 			jp += k;
 			k = 1;
@@ -96,13 +110,16 @@
 	p0 = p;
 
 	/* And with the opposite comparison */
-	ip = -1; jp = 0; k = p = 1;
+	ip = -1;
+	jp = 0;
+	k = p = 1;
 	while (jp+k<l) {
 		if (n[ip+k] == n[jp+k]) {
 			if (k == p) {
 				jp += p;
 				k = 1;
-			} else k++;
+			} else
+				k++;
 		} else if (n[ip+k] < n[jp+k]) {
 			jp += k;
 			k = 1;
@@ -112,14 +129,16 @@
 			k = p = 1;
 		}
 	}
-	if (ip+1 > ms+1) ms = ip;
+	if (ip+1 > ms+1)
+		ms = ip;
 	else p = p0;
 
 	/* Periodic needle? */
 	if (memcmp(n, n+p, ms+1)) {
 		mem0 = 0;
 		p = MAX(ms, l-ms-1) + 1;
-	} else mem0 = l-p;
+	} else
+		mem0 = l-p;
 	mem = 0;
 
 	/* Initialize incremental end-of-haystack pointer */
@@ -135,7 +154,8 @@
 			if (z2) {
 				z = z2;
 				if (z-h < l) return 0;
-			} else z += grow;
+			} else
+				z += grow;
 		}
 
 		/* Check last byte first; advance by shift on mismatch */
@@ -155,21 +175,25 @@
 		}
 
 		/* Compare right half */
-		for (k=MAX(ms+1,mem); n[k] && n[k] == h[k]; k++);
+		for (k=MAX(ms+1,mem); n[k] && n[k] == h[k]; k++)
+			;
 		if (n[k]) {
 			h += k-ms;
 			mem = 0;
 			continue;
 		}
 		/* Compare left half */
-		for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--);
-		if (k <= mem) return (char *)h;
+		for (k=ms+1; k>mem && n[k-1] == h[k-1]; k--)
+			;
+		if (k <= mem)
+			return (char *)h;
 		h += p;
 		mem = mem0;
 	}
 }
 
-char *strstr(const char *h, const char *n)
+char *
+strstr(const char *h, const char *n)
 {
 	/* Return immediately on empty needle */
 	if (!n[0]) return (char *)h;