parser.c: Extract rstring_memcmp

Author: byroot

ext/json/ext/parser/parser.c

@@ -84,18 +84,9 @@ static void rvalue_cache_insert_at(rvalue_cache *cache, int index, VALUE rstring
     cache->entries[index] = rstring;
 }
 
-static ALWAYS_INLINE() int rstring_cache_cmp(const char *str, const long length, VALUE rstring)
-{
 #if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) && defined(__has_builtin) && __has_builtin(__builtin_bswap64)
-    const char *rptr;    
-    long rstring_length;
-    
-    RSTRING_GETMEM(rstring, rptr, rstring_length);
-    
-    if (length != rstring_length) {
-        return (int)(length - rstring_length);
-    }
-
+static ALWAYS_INLINE() int rstring_memcmp(const char *str, const char *rptr, const long length)
+{
     long i = 0;
 
     for (; i+8 <= length; i += 8) {
@@ -118,14 +109,23 @@ static ALWAYS_INLINE() int rstring_cache_cmp(const char *str, const long length,
     }
 
     return 0;
+}
 #else
-    long rstring_length = RSTRING_LEN(rstring);
-    if (length == rstring_length) {
-        return memcmp(str, RSTRING_PTR(rstring), length);
-    } else {
+#define rstring_memcmp memcmp
+#endif
+
+static ALWAYS_INLINE() int rstring_cache_cmp(const char *str, const long length, VALUE rstring)
+{
+    const char *rptr;
+    long rstring_length;
+
+    RSTRING_GETMEM(rstring, rptr, rstring_length);
+
+    if (length != rstring_length) {
         return (int)(length - rstring_length);
     }
-#endif 
+
+    return rstring_memcmp(str, rptr, length);
 }
 
 static ALWAYS_INLINE() VALUE rstring_cache_fetch(rvalue_cache *cache, const char *str, const long length)