From f476227930793f94e6ca9bd268b76bbf5c4f29c3 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Sat, 16 May 2015 00:52:36 +0000
Subject:  C macros suck. Rewrote the case_diffb thing.

---
 src/include/skalibs/bytestr.h |  6 +++---
 src/libstddjb/case_diffb.c    | 32 --------------------------------
 src/libstddjb/case_diffn.c    | 23 +++++++++++++++++++++++
 3 files changed, 26 insertions(+), 35 deletions(-)
 delete mode 100644 src/libstddjb/case_diffb.c
 create mode 100644 src/libstddjb/case_diffn.c

(limited to 'src')

diff --git a/src/include/skalibs/bytestr.h b/src/include/skalibs/bytestr.h
index fd602e0..b241197 100644
--- a/src/include/skalibs/bytestr.h
+++ b/src/include/skalibs/bytestr.h
@@ -25,7 +25,7 @@
 #define str_diffn strncmp
 #define str_copy(to, from) strlen(strcpy(to, from))
 #define case_diffs strcasecmp
-#define case_diffb(a, n, b) strncasecmp(a, (b), n)
+#define case_diffn strncasecmp
 
 #else
 
@@ -39,11 +39,10 @@ extern int str_diff (char const *, char const *) gccattr_pure ;
 extern int str_diffn (char const *, char const *, unsigned int) gccattr_pure ;
 extern unsigned int str_copy (char *, char const *) ;
 extern int case_diffs (char const *, char const *) gccattr_pure ;
-extern int case_diffb (char const *, unsigned int, char const *) gccattr_pure ;
+extern int case_diffn (char const *, char const *, unsigned int) gccattr_pure ;
 
 #endif	
 
-
 extern unsigned int byte_chr (char const *, unsigned int, int) gccattr_pure ;
 extern unsigned int byte_rchr (char const *, unsigned int, int) gccattr_pure ;
 extern unsigned int byte_in (char const *, unsigned int, char const *, unsigned int) gccattr_pure ;
@@ -61,6 +60,7 @@ extern void case_lowers (char *) ;
 extern void case_lowerb (char *, unsigned int) ;
 extern void case_uppers (char *) ;
 extern void case_upperb (char *, unsigned int) ;
+#define case_diffb(a, n, b) case_diffn(a, (b), n)
 #define case_equals(a, b) (!case_diffs(a, b))
 #define case_equalb(a, n, b) (!case_diffb(a, n, b))
 #define case_starts(s, t) case_startb(s, str_len(s), t)
diff --git a/src/libstddjb/case_diffb.c b/src/libstddjb/case_diffb.c
deleted file mode 100644
index 47e10bb..0000000
--- a/src/libstddjb/case_diffb.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* ISC license. */
-
-#include <skalibs/config.h>
-#include <skalibs/bytestr.h>
-
-#ifdef SKALIBS_FLAG_REPLACE_LIBC
-
-int case_diffb (char const *s, unsigned int len, char const *t)
-{
-  register unsigned char x = 0, y = 0 ;
-  unsigned char const d = 'a' - 'A' ;
-
-  while (len-- && (x == y))
-  {
-    x = *s++ ;
-    if (('a' <= x) && (x <= 'z')) x -= d ;
-    y = *t++ ;
-    if (('a' <= y) && (y <= 'z')) y -= d ;
-  }
-  return (int)(x - y) ;
-}
-
-#else
-
-#include <strings.h>
-
-int case_diffb (char const *s, unsigned int len, char const *t)
-{
-  return strncasecmp(s, t, len) ;
-}
-
-#endif
diff --git a/src/libstddjb/case_diffn.c b/src/libstddjb/case_diffn.c
new file mode 100644
index 0000000..0e75aa5
--- /dev/null
+++ b/src/libstddjb/case_diffn.c
@@ -0,0 +1,23 @@
+/* ISC license. */
+
+#include <skalibs/config.h>
+#include <skalibs/bytestr.h>
+
+#ifdef SKALIBS_FLAG_REPLACE_LIBC
+
+int case_diffn (char const *s, char const *t, unsigned int len)
+{
+  register unsigned char x = 0, y = 0 ;
+  unsigned char const d = 'a' - 'A' ;
+
+  while (len-- && (x == y))
+  {
+    x = *s++ ;
+    if (('a' <= x) && (x <= 'z')) x -= d ;
+    y = *t++ ;
+    if (('a' <= y) && (y <= 'z')) y -= d ;
+  }
+  return (int)(x - y) ;
+}
+
+#endif
-- 
cgit v1.3.1