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_rchr.c | 24 ++++--------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

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

diff --git a/src/libstddjb/str_rchr.c b/src/libstddjb/str_rchr.c
index 39a4822..c82ee69 100644
--- a/src/libstddjb/str_rchr.c
+++ b/src/libstddjb/str_rchr.c
@@ -1,28 +1,12 @@
 /* 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_rchr (register char const *s, int c)
+size_t str_rchr (register char const *s, int c)
 {
   register char *p = strrchr(s, c) ;
-  return p ? (unsigned int)(p - s) : (unsigned int)strlen(s) ;
-}
-
-#else
-
-unsigned int str_rchr (register char const *s, int c)
-{
-  register char ch = c ;
-  register char const *t = s ;
-  register char const *u = 0 ;
-  for ( ; *t ; t++) if (*t == ch) u = t ;
-  if (!u) u = t ;
-  return u - s ;
+  return p ? p - s : strlen(s) ;
 }
 
-#endif
-- 
cgit v1.2.3