From: Bruno Haible Date: Tue, 23 Sep 2025 19:44:46 +0000 (+0200) Subject: gen-uni-tables: Fix compilation error (regression 2025-09-17). X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e3fb6645d74b86752592a885156344ce034c1e38;p=thirdparty%2Fgnulib.git gen-uni-tables: Fix compilation error (regression 2025-09-17). * lib/gen-uni-tables.c (streq, memeq): Move definitions before their first use. --- diff --git a/ChangeLog b/ChangeLog index 02df4f6732..a942e53a40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-09-23 Bruno Haible + + gen-uni-tables: Fix compilation error (regression 2025-09-17). + * lib/gen-uni-tables.c (streq, memeq): Move definitions before their + first use. + 2025-09-23 Bruno Haible Clarify link dependency towards libgcrypt or OpenSSL's libcrypto. diff --git a/lib/gen-uni-tables.c b/lib/gen-uni-tables.c index 97f8ff4b0d..00c52fe757 100644 --- a/lib/gen-uni-tables.c +++ b/lib/gen-uni-tables.c @@ -54,29 +54,29 @@ /* Utility functions. */ static bool -str_startswith (const char *string, const char *prefix) +streq (char const *s1, char const *s2) { - return strncmp (string, prefix, strlen (prefix)) == 0; + return strcmp (s1, s2) == 0; } static bool -str_endswith (const char *string, const char *suffix) +memeq (void const *s1, void const *s2, size_t n) { - size_t len = strlen (string); - size_t n = strlen (suffix); - return len >= n && streq (string + len - n, suffix); + return memcmp (s1, s2, n) == 0; } static bool -memeq (void const *s1, void const *s2, size_t n) +str_startswith (const char *string, const char *prefix) { - return !memcmp (s1, s2, n); + return strncmp (string, prefix, strlen (prefix)) == 0; } static bool -streq (char const *s1, char const *s2) +str_endswith (const char *string, const char *suffix) { - return !strcmp (s1, s2); + size_t len = strlen (string); + size_t n = strlen (suffix); + return len >= n && streq (string + len - n, suffix); } /* ========================================================================= */