Merge tag '1.4' into since

Version 1.4

1 files changed, 19 insertions, 7 deletions

diff --git a/vmemalloc.c b/vmemalloc.c
index 8d92035..d725374 100644
--- a/vmemalloc.c
+++ b/vmemalloc.c
@@ -1,5 +1,5 @@
 /* See LICENSE file for copyright and license details. */
-#include "libsimple.h"
+#include "common.h"
 #include <stdalign.h>
 #ifndef TEST
 
@@ -76,7 +76,7 @@ vmemalloc_parse_args(struct memalloc_state *state, size_t n, va_list ap)
 		case LIBSIMPLE_MEMALLOC_CONDITIONAL_ZERO_INIT:
 			if (state->zero_init >= 0)
 				goto inval;
-			state->zero_init = va_arg(ap, int);
+			state->zero_init = (char)va_arg(ap, int);
 			state->zero_init = !!state->zero_init;
 			break;
 
@@ -158,23 +158,35 @@ vmemalloc_parse_args(struct memalloc_state *state, size_t n, va_list ap)
 		}
 	}
 
-	return 0;
 inval:
 	errno = EINVAL;
 	return -1;
 }
 
+LIBSIMPLE_GCC_ONLY__(__attribute__((__const__)))
 static size_t
 gcd(size_t u, size_t v)
 {
 	size_t t;
 	int shift = 0;
 	/* Not needed because u>0, v>0: if (!(u | v)) return u + v; */
-	while (!((u | v) & 1)) u >>= 1, v >>= 1, shift++;
-	while (!(u & 1))       u >>= 1;
+	while (!((u | v) & 1)) {
+		u >>= 1;
+		v >>= 1;
+		shift++;
+	}
+	while (!(u & 1)) {
+		u >>= 1;
+	}
 	do {
-		while (!(v & 1)) v >>= 1;
-		if (u > v)       t = u, u = v, v = t;
+		while (!(v & 1)) {
+			v >>= 1;
+		}
+		if (u > v) {
+			t = u;
+			u = v;
+			v = t;
+		}
 	} while (v -= u);
 	return u << shift;
 }