Resync

Author: LibretroAdmin

file/archive_file_7z.c

@@ -355,7 +355,7 @@ static int sevenzip_parse_file_init(file_archive_transfer_t *state,
    if (filestream_read(state->archive_file, magic_buf, SEVENZIP_MAGIC_LEN) != SEVENZIP_MAGIC_LEN)
       goto error;
 
-   if (string_is_not_equal_fast(magic_buf, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN))
+   if (memcmp(magic_buf, SEVENZIP_MAGIC, SEVENZIP_MAGIC_LEN) != 0)
       goto error;
 
    sevenzip_context = (struct sevenzip_context_t*)sevenzip_stream_new();

file/file_path.c

@@ -1142,7 +1142,7 @@ size_t fill_pathname_abbreviate_special(char *s,
 
          if (!PATH_CHAR_IS_SLASH(*in_path))
          {
-            strcpy_literal(s, PATH_DEFAULT_SLASH());
+            strcpy(s, PATH_DEFAULT_SLASH());
             s++;
             len--;
          }

formats/png/rpng.c

@@ -1205,8 +1205,7 @@ bool rpng_start(rpng_t *rpng)
    if (rpng->buff_end - rpng->buff_data < 8)
       return false;
 
-   if (string_is_not_equal_fast(
-            rpng->buff_data, png_magic, sizeof(png_magic)))
+   if (memcmp(rpng->buff_data, png_magic, sizeof(png_magic)) != 0)
       return false;
 
    rpng->buff_data += 8;

include/string/stdstring.h

@@ -37,13 +37,8 @@ RETRO_BEGIN_DECLS
 
 #define STRLEN_CONST(x)                   ((sizeof((x))-1))
 
-#define strcpy_literal(a, b)              strcpy(a, b)
-
 #define string_is_not_equal(a, b)         !string_is_equal((a), (b))
 
-#define string_is_not_equal_fast(a, b, size) (memcmp(a, b, size) != 0)
-#define string_is_equal_fast(a, b, size)     (memcmp(a, b, size) == 0)
-
 #define TOLOWER(c)   ((c) |  (lr_char_props[(unsigned char)(c)] & 0x20))
 #define TOUPPER(c)   ((c) & ~(lr_char_props[(unsigned char)(c)] & 0x20))
 
@@ -83,16 +78,16 @@ static INLINE bool string_starts_with(const char *str, const char *prefix)
    return (str && prefix) ? !strncmp(prefix, str, strlen(prefix)) : false;
 }
 
-static INLINE bool string_ends_with_size(const char *str, const char *suffix,
-      size_t str_len, size_t suffix_len)
+static INLINE bool string_ends_with_size(const char *s, const char *suffix,
+      size_t len, size_t suffix_len)
 {
-   return (str_len < suffix_len) ? false :
-         !memcmp(suffix, str + (str_len - suffix_len), suffix_len);
+   return (len < suffix_len) ? false :
+         !memcmp(suffix, s + (len - suffix_len), suffix_len);
 }
 
-static INLINE bool string_ends_with(const char *str, const char *suffix)
+static INLINE bool string_ends_with(const char *s, const char *suffix)
 {
-   return str && suffix && string_ends_with_size(str, suffix, strlen(str), strlen(suffix));
+   return s && suffix && string_ends_with_size(s, suffix, strlen(s), strlen(suffix));
 }
 
 /**

test/string/test_stdstring.c

@@ -161,10 +161,10 @@ END_TEST
 
 START_TEST (test_string_comparison)
 {
-   ck_assert(string_is_not_equal_fast("foo", "bar", 3));
-   ck_assert(string_is_equal_fast("foo2", "foo2", 4));
-   ck_assert(!string_is_equal_fast("foo1", "foo2", 4));
-   ck_assert(string_is_equal_fast("foo1", "foo2", 3));
+   ck_assert(memcmp("foo", "bar", 3)   != 0);
+   ck_assert(memcmp("foo2", "foo2", 4) == 0);
+   ck_assert(memcmp("foo1", "foo2", 4) != 0);
+   ck_assert(memcmp("foo1", "foo2", 3) == 0);
 }
 END_TEST