From a896ca2a8c617e5e00ffd5fc9e69331ad754e5b3 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Wed, 15 Feb 2017 17:40:40 +0000
Subject:  add arc4random_addrandom sysdep; next batch of types changes.

 The library isn't supposed to be functional yet: there are
still a lot of type mismatches.
---
 src/libstddjb/str_chr.c | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

(limited to 'src/libstddjb/str_chr.c')

diff --git a/src/libstddjb/str_chr.c b/src/libstddjb/str_chr.c
index ed55e50..a415de6 100644
--- a/src/libstddjb/str_chr.c
+++ b/src/libstddjb/str_chr.c
@@ -1,33 +1,11 @@
 /* ISC license. */
 
-#include <skalibs/config.h>
-#include <skalibs/bytestr.h>
-
-#ifndef SKALIBS_FLAG_REPLACE_LIBC
-
+#include <sys/types.h>
 #include <string.h>
+#include <skalibs/bytestr.h>
 
-unsigned int str_chr (register char const *s, int c)
-{
-  register char *p = strchr(s, c) ;
-  return p ? (unsigned int)(p - s) : strlen(s) ;
-}
-
-#else
-
-unsigned int str_chr (register char const *s, int c)
+size_t str_chr (char const *s, int c)
 {
-  register char ch = c ;
-  register char const *t = s ;
-
-  for (;;)
-  {
-    if (!*t) break; if (*t == ch) break; ++t;
-    if (!*t) break; if (*t == ch) break; ++t;
-    if (!*t) break; if (*t == ch) break; ++t;
-    if (!*t) break; if (*t == ch) break; ++t;
-  }
-  return t - s ;
+  char *p = strchr(s, c) ;
+  return p ? p - s : strlen(s) ;
 }
-
-#endif
-- 
cgit v1.3.1