diff options
Diffstat (limited to 'string')
-rw-r--r-- | string/Versions | 3 | ||||
-rw-r--r-- | string/memcmp.c | 3 | ||||
-rw-r--r-- | string/string.h | 16 | ||||
-rw-r--r-- | string/tester.c | 16 |
4 files changed, 38 insertions, 0 deletions
diff --git a/string/Versions b/string/Versions index 298ecd4..864c4cf 100644 --- a/string/Versions +++ b/string/Versions @@ -89,4 +89,7 @@ libc { sigdescr_np; sigabbrev_np; strerrordesc_np; strerrorname_np; } + GLIBC_2.35 { + __memcmpeq; + } } diff --git a/string/memcmp.c b/string/memcmp.c index 9b46d7a..eac4112 100644 --- a/string/memcmp.c +++ b/string/memcmp.c @@ -359,3 +359,6 @@ libc_hidden_builtin_def(memcmp) # undef bcmp weak_alias (memcmp, bcmp) #endif + +#undef __memcmpeq +strong_alias (memcmp, __memcmpeq) diff --git a/string/string.h b/string/string.h index b1b083e..e70feea 100644 --- a/string/string.h +++ b/string/string.h @@ -64,6 +64,22 @@ extern void *memset (void *__s, int __c, size_t __n) __THROW __nonnull ((1)); extern int memcmp (const void *__s1, const void *__s2, size_t __n) __THROW __attribute_pure__ __nonnull ((1, 2)); +/* Compare N bytes of S1 and S2. Return zero if S1 and S2 are equal. + Return some non-zero value otherwise. + + Essentially __memcmpeq has the exact same semantics as memcmp + except the return value is less constrained. memcmp is always a + correct implementation of __memcmpeq. As well !!memcmp, -memcmp, + or bcmp are correct implementations. + + __memcmpeq is meant to be used by compilers when memcmp return is + only used for its bolean value. + + __memcmpeq is declared only for use by compilers. Programs should + continue to use memcmp. */ +extern int __memcmpeq (const void *__s1, const void *__s2, size_t __n) + __THROW __attribute_pure__ __nonnull ((1, 2)); + /* Search N bytes of S for C. */ #ifdef __CORRECT_ISO_CPP_STRING_H_PROTO extern "C++" diff --git a/string/tester.c b/string/tester.c index 778160a..605b3f0 100644 --- a/string/tester.c +++ b/string/tester.c @@ -1450,6 +1450,19 @@ test_bcmp (void) } static void +test_memcmpeq (void) +{ + it = "__memcmpeq"; + check (__memcmpeq ("a", "a", 1) == 0, 1); /* Identity. */ + check (__memcmpeq ("abc", "abc", 3) == 0, 2); /* Multicharacter. */ + check (__memcmpeq ("abcd", "abce", 4) != 0, 3); /* Honestly unequal. */ + check (__memcmpeq ("abce", "abcd", 4) != 0, 4); + check (__memcmpeq ("alph", "beta", 4) != 0, 5); + check (__memcmpeq ("abce", "abcd", 3) == 0, 6); /* Count limited. */ + check (__memcmpeq ("abc", "def", 0) == 0, 8); /* Zero count. */ +} + +static void test_strerror (void) { it = "strerror"; @@ -1611,6 +1624,9 @@ main (void) /* bcmp - somewhat like memcmp. */ test_bcmp (); + /* __memcmpeq - somewhat like memcmp. */ + test_memcmpeq (); + /* strndup. */ test_strndup (); |