Apply clang-tidy fixes to libc files

src/ctype/tolower.c

@@ -5,6 +5,10 @@
 int tolower(int c)
 {
 	if(isupper(c))
-		return c | 32;
+	{
+		{
+			return c | 32;
+		}
+	}
 	return c;
 }

src/ctype/toupper.c

@@ -5,6 +5,10 @@
 int toupper(int c)
 {
 	if(islower(c))
-		return c & 0x5f;
+	{
+		{
+			return c & 0x5f;
+		}
+	}
 	return c;
 }

src/errno/strerror.c

@@ -30,9 +30,21 @@ char* strerror(int e)
 		}
 	}
 	for(i = 0; errid[i] && errid[i] != e; i++)
-		;
-	for(s = errmsg; i; s++, i--)
-		for(; *s; s++)
+	{
+		{
 			;
+		}
+	}
+	for(s = errmsg; i; s++, i--)
+	{
+		{
+			for(; *s; s++)
+			{
+				{
+					;
+				}
+			}
+		}
+	}
 	return (char*)(uintptr_t)s;
 }

src/exit/_Exit.c

@@ -5,5 +5,7 @@ __attribute__((weak, noreturn)) void _Exit(int ec)
 	(void)ec;
 
 	while(1)
+	{
 		;
+	}
 }

src/stdlib/heapsort.c

@@ -148,7 +148,11 @@ int (*compar)(const void*, const void*);
 	char *base, *k, *p, *t;
 
 	if(nmemb <= 1)
-		return (0);
+	{
+		{
+			return (0);
+		}
+	}
 
 	if(!size)
 	{
@@ -157,7 +161,11 @@ int (*compar)(const void*, const void*);
 	}
 
 	if((k = malloc(size)) == NULL)
-		return (-1);
+	{
+		{
+			return (-1);
+		}
+	}
 
 	/*
 	 * Items are numbered from 1 to nmemb, so offset from size bytes

src/stdlib/heapsort_r.c

@@ -149,7 +149,11 @@ int (*compar)(void*, const void*, const void*);
 	char *base, *k, *p, *t;
 
 	if(nmemb <= 1)
-		return (0);
+	{
+		{
+			return (0);
+		}
+	}
 
 	if(!size)
 	{
@@ -158,7 +162,11 @@ int (*compar)(void*, const void*, const void*);
 	}
 
 	if((k = malloc(size)) == NULL)
-		return (-1);
+	{
+		{
+			return (-1);
+		}
+	}
 
 	/*
 	 * Items are numbered from 1 to nmemb, so offset from size bytes

src/stdlib/qsort.c

@@ -36,8 +36,10 @@ typedef int cmp_t(void*, const void*, const void*);
 #else
 typedef int cmp_t(const void*, const void*);
 #endif
-static inline char* med3(char*, char*, char*, cmp_t*, void*) __attribute__((always_inline));
-static inline void swapfunc(char*, char*, size_t, size_t) __attribute__((always_inline));
+static inline char* med3(char* a, char* b, char* c, cmp_t* cmd, void* thunk)
+	__attribute__((always_inline));
+static inline void swapfunc(char* a, char* b, size_t n, size_t swaptype)
+	__attribute__((always_inline));
 
 #define min(a, b) (a) < (b) ? a : b
 
@@ -142,8 +144,12 @@ static void _qsort(void* a, size_t n, size_t es,
 	if(n < 7)
 	{
 		for(pm = (char*)a + es; pm < (char*)a + n * es; pm += es)
+		{
 			for(pl = pm; pl > (char*)a && CMP(thunk, pl - es, pl) > 0; pl -= es)
+			{
 				swap(pl, pl - es);
+			}
+		}
 		return;
 	}
 	pm = (char*)a + (n / 2) * es;
@@ -187,7 +193,9 @@ static void _qsort(void* a, size_t n, size_t es,
 			pc -= es;
 		}
 		if(pb > pc)
+		{
 			break;
+		}
 		swap(pb, pc);
 		swap_cnt = 1;
 		pb += es;
@@ -204,6 +212,7 @@ static void _qsort(void* a, size_t n, size_t es,
 	{ /* Switch to insertion sort */
 		r = 1 + n / 4; /* n >= 7, so r >= 2 */
 		for(pm = (char*)a + es; pm < (char*)a + n * es; pm += es)
+		{
 			for(pl = pm; pl > (char*)a && CMP(thunk, pl - es, pl) > 0; pl -= es)
 			{
 				swap(pl, pl - es);
@@ -212,16 +221,19 @@ static void _qsort(void* a, size_t n, size_t es,
 					goto nevermind;
 				}
 			}
+		}
 		return;
 	}
 
 nevermind:
 	if((r = (uintptr_t)pb - (uintptr_t)pa) > es)
+	{
 #ifdef I_AM_QSORT_R
 		_qsort(a, r / es, es, thunk, cmp, depth_limit);
 #else
 		_qsort(a, r / es, es, cmp, depth_limit);
 #endif
+	}
 	if((r = (uintptr_t)pd - (uintptr_t)pc) > es)
 	{
 		/* Iterate rather than recurse to save stack space */

src/stdlib/strtol.c

@@ -113,7 +113,11 @@ register int base;
 		c = *s++;
 	}
 	else if(c == '+')
-		c = *s++;
+	{
+		{
+			c = *s++;
+		}
+	}
 	if((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
 	{
 		c = s[1];
@@ -127,7 +131,11 @@ register int base;
 		base = 2;
 	}
 	if(base == 0)
-		base = c == '0' ? 8 : 10;
+	{
+		{
+			base = c == '0' ? 8 : 10;
+		}
+	}
 
 	/*
 	 * Compute the cutoff value between legal numbers and illegal

src/stdlib/strtoll.c

@@ -88,7 +88,11 @@ long long int strtoll(const char* nptr, char** endptr, int base)
 	{
 		neg = 0;
 		if(c == '+')
-			c = *s++;
+		{
+			{
+				c = *s++;
+			}
+		}
 	}
 	if((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
 	{
@@ -97,7 +101,11 @@ long long int strtoll(const char* nptr, char** endptr, int base)
 		base = 16;
 	}
 	if(base == 0)
-		base = c == '0' ? 8 : 10;
+	{
+		{
+			base = c == '0' ? 8 : 10;
+		}
+	}
 
 	/*
 	 * Compute the cutoff value between legal numbers and illegal
@@ -132,15 +140,35 @@ long long int strtoll(const char* nptr, char** endptr, int base)
 	for(acc = 0, any = 0;; c = (unsigned char)*s++)
 	{
 		if(isdigit(c))
-			c -= '0';
+		{
+			{
+				c -= '0';
+			}
+		}
 		else if(isalpha(c))
-			c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+		{
+			{
+				c -= isupper(c) ? 'A' - 10 : 'a' - 10;
+			}
+		}
 		else
-			break;
+		{
+			{
+				break;
+			}
+		}
 		if(c >= base)
-			break;
+		{
+			{
+				break;
+			}
+		}
 		if(any < 0)
-			continue;
+		{
+			{
+				continue;
+			}
+		}
 		if(neg)
 		{
 			if(acc < cutoff || (acc == cutoff && c > cutlim))

src/stdlib/strtoul.c

@@ -114,7 +114,11 @@ register int base;
 		base = 2;
 	}
 	if(base == 0)
-		base = c == '0' ? 8 : 10;
+	{
+		{
+			base = c == '0' ? 8 : 10;
+		}
+	}
 	cutoff = (unsigned long)ULONG_MAX / (unsigned long)base;
 	cutlim = (int)((unsigned long)ULONG_MAX % (unsigned long)base);
 	for(acc = 0, any = 0;; c = *s++)

src/stdlib/strtoull.c

@@ -66,7 +66,11 @@ unsigned long long strtoull(const char* __restrict nptr, char** __restrict endpt
 	{
 		neg = 0;
 		if(c == '+')
-			c = *s++;
+		{
+			{
+				c = *s++;
+			}
+		}
 	}
 	if((base == 0 || base == 16) && c == '0' && (*s == 'x' || *s == 'X'))
 	{
@@ -75,27 +79,59 @@ unsigned long long strtoull(const char* __restrict nptr, char** __restrict endpt
 		base = 16;
 	}
 	if(base == 0)
-		base = c == '0' ? 8 : 10;
+	{
+		{
+			base = c == '0' ? 8 : 10;
+		}
+	}
 	acc = any = 0;
 	if(base < 2 || base > 36)
-		goto noconv;
+	{
+		{
+			goto noconv;
+		}
+	}
 
 	cutoff = ULLONG_MAX / (unsigned long long)base;
 	cutlim = (int)(ULLONG_MAX % (unsigned long long)base);
 	for(;; c = *s++)
 	{
 		if(c >= '0' && c <= '9')
-			c -= '0';
+		{
+			{
+				c -= '0';
+			}
+		}
 		else if(c >= 'A' && c <= 'Z')
-			c -= 'A' - 10;
+		{
+			{
+				c -= 'A' - 10;
+			}
+		}
 		else if(c >= 'a' && c <= 'z')
-			c -= 'a' - 10;
+		{
+			{
+				c -= 'a' - 10;
+			}
+		}
 		else
-			break;
+		{
+			{
+				break;
+			}
+		}
 		if(c >= base)
-			break;
+		{
+			{
+				break;
+			}
+		}
 		if(any < 0 || acc > cutoff || (acc == cutoff && c > cutlim))
-			any = -1;
+		{
+			{
+				any = -1;
+			}
+		}
 		else
 		{
 			any = 1;