switch from clang-format to uncrustify

The output is close enough, and I like that uncrustify is a third-party
tool, so people can install a single tool for formatting instead of
having to lug around a whole toolchain. I fully expect to have to add
settings to uncrustify.conf, but let's see how this goes.

6 files changed, 24 insertions, 21 deletions

diff --git a/common/bits.c b/common/bits.c
index dde39f7..92e7be2 100644
--- a/common/bits.c
+++ b/common/bits.c
@@ -29,7 +29,7 @@ __weak uint64_t __bswap64(const uint64_t u)
 	       (u & 0x0000ff0000000000ULL) >> 24 |
 	       (u & 0x000000ff00000000ULL) >> 8 |
 	       (u & 0x00000000ff000000ULL) << 8 |
-	       (u & 0x0000000000ff0000ULL) << 24 |
-	       (u & 0x000000000000ff00ULL) << 40 |
-	       (u & 0x00000000000000ffULL) << 56;
+	        (u & 0x0000000000ff0000ULL) << 24 |
+	        (u & 0x000000000000ff00ULL) << 40 |
+	        (u & 0x00000000000000ffULL) << 56;
 }
diff --git a/common/debug.c b/common/debug.c
index 15f71dc..0382ba4 100644
--- a/common/debug.c
+++ b/common/debug.c
@@ -341,7 +341,7 @@ static size_t __print_integral(ssize_t value, size_t base, size_t flags,
 
 void dbg(const char *fmt, ...)
 {
-	/* largely inspired by 
+	/* largely inspired by
 	 * https://github.com/mpaland/printf/blob/master/printf.c
 	 */
 
@@ -533,7 +533,7 @@ void dbg(const char *fmt, ...)
 				width = precision;
 
 			/* formatting doesn't apply to decimal integers
-				 * */
+			 * */
 			if (*fmt != 'i' && *fmt != 'd') {
 				__clear_bit(flags, SIGN_FLAG);
 				__set_bit(flags, UNSIGN_FLAG);
diff --git a/common/elf.c b/common/elf.c
index e60b21f..97d8fd7 100644
--- a/common/elf.c
+++ b/common/elf.c
@@ -61,10 +61,10 @@ static void __map_exec(struct tcb *t, vm_t bin, uint8_t ei_c, vm_t phstart,
 		 * TODO: also fix, this modifies only the first region. Create new
 		 * function?
 		 *
-		pm_t paddr = 0;
-		stat_vpage(t->b_r, va, &paddr, 0, 0);
-		mod_vpage(t->b_r, va, paddr, uvflags);
-		*/
+		   pm_t paddr = 0;
+		   stat_vpage(t->b_r, va, &paddr, 0, 0);
+		   mod_vpage(t->b_r, va, paddr, uvflags);
+		 */
 	}
 }
 
diff --git a/common/pmem.c b/common/pmem.c
index 5af17ac..725a9ff 100644
--- a/common/pmem.c
+++ b/common/pmem.c
@@ -32,14 +32,14 @@
 /* NOTE: these are all for pnum_t, i.e. O0_SHIFT is from 0 */
 #define __foreach_page(var, start, end, attr, neg)                             \
 	for (size_t i = num_indexes(start); i < num_elems(end); ++i)           \
-		if (var->attr[i] == (mm_info_t)(-1))                           \
-			continue;                                              \
-		else                                                           \
-			for (pnum_t page = i * MM_OINFO_WIDTH, j = 0;          \
-			     j < (pnum_t)MIN((end)-i * MM_OINFO_WIDTH,         \
-			                     MM_OINFO_WIDTH);                  \
-			     ++j, ++page)                                      \
-				if (neg(__is_nset(var->attr[i], j)))
+	if (var->attr[i] == (mm_info_t)(-1))                           \
+	continue;                                              \
+	else                                                           \
+	for (pnum_t page = i * MM_OINFO_WIDTH, j = 0;          \
+	     j < (pnum_t)MIN((end)-i * MM_OINFO_WIDTH,         \
+	                     MM_OINFO_WIDTH);                  \
+	     ++j, ++page)                                      \
+	if (neg(__is_nset(var->attr[i], j)))
 
 #define NEG !
 #define foreach_full_page(var, start, order)                                   \
diff --git a/common/uapi/mem.c b/common/uapi/mem.c
index 83d7289..b953119 100644
--- a/common/uapi/mem.c
+++ b/common/uapi/mem.c
@@ -46,8 +46,7 @@ SYSCALL_DEFINE3(req_pmem)(sys_arg_t paddr, sys_arg_t size, sys_arg_t flags)
 	return (struct sys_ret){ OK, alloc_devmem(r, paddr, size, flags) };
 }
 
-SYSCALL_DEFINE2(req_sharedmem)
-(sys_arg_t size, sys_arg_t flags)
+SYSCALL_DEFINE2(req_sharedmem)(sys_arg_t size, sys_arg_t flags)
 {
 	/* TODO: check that requester is server */
 	struct tcb *t = cur_tcb();
diff --git a/common/uapi/timers.c b/common/uapi/timers.c
index ca2443b..27928a3 100644
--- a/common/uapi/timers.c
+++ b/common/uapi/timers.c
@@ -24,14 +24,18 @@ SYSCALL_DEFINE0(timebase)()
 SYSCALL_DEFINE2(req_rel_timer)(sys_arg_t ticks, sys_arg_t repeat)
 {
 	return (struct sys_ret){
-		OK, new_rel_timer(cur_tcb()->tid, scaled_ticks(ticks, repeat))
+		       OK,
+		       new_rel_timer(cur_tcb()->tid,
+		                     scaled_ticks(ticks, repeat))
 	};
 }
 
 SYSCALL_DEFINE2(req_abs_timer)(sys_arg_t ticks, sys_arg_t repeat)
 {
 	return (struct sys_ret){
-		OK, new_abs_timer(cur_tcb()->tid, scaled_ticks(ticks, repeat))
+		       OK,
+		       new_abs_timer(cur_tcb()->tid,
+		                     scaled_ticks(ticks, repeat))
 	};
 }