summaryrefslogtreecommitdiff
path: root/src/string/strlen.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/string/strlen.c')
-rw-r--r--src/string/strlen.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/string/strlen.c b/src/string/strlen.c
index 936fb5cf..d6f8631d 100644
--- a/src/string/strlen.c
+++ b/src/string/strlen.c
@@ -3,7 +3,7 @@
#include <stdint.h>
#include <limits.h>
-#define ALIGN (sizeof(size_t)-1)
+#define ALIGN (sizeof(size_t))
#define ONES ((size_t)-1/UCHAR_MAX)
#define HIGHS (ONES * (UCHAR_MAX/2+1))
#define HASZERO(x) ((x)-ONES & ~(x) & HIGHS)
@@ -12,10 +12,8 @@ size_t strlen(const char *s)
{
const char *a = s;
const size_t *w;
- for (; ((uintptr_t)s & ALIGN) && *s; s++);
- if (*s) {
- for (w = (const void *)s; !HASZERO(*w); w++);
- for (s = (const void *)w; *s; s++);
- }
+ for (; (uintptr_t)s % ALIGN; s++) if (!*s) return s-a;
+ for (w = (const void *)s; !HASZERO(*w); w++);
+ for (s = (const void *)w; *s; s++);
return s-a;
}