aboutsummaryrefslogtreecommitdiff
path: root/string
diff options
context:
space:
mode:
Diffstat (limited to 'string')
-rw-r--r--string/memrchr.c5
-rw-r--r--string/strcasecmp.c9
-rw-r--r--string/strncase.c10
3 files changed, 5 insertions, 19 deletions
diff --git a/string/memrchr.c b/string/memrchr.c
index 86cd5b9..3cfceb7 100644
--- a/string/memrchr.c
+++ b/string/memrchr.c
@@ -61,10 +61,7 @@ __memrchr
#else
MEMRCHR
#endif
- (s, c_in, n)
- const __ptr_t s;
- int c_in;
- size_t n;
+ (const __ptr_t s, int c_in, size_t n)
{
const unsigned char *char_ptr;
const unsigned long int *longword_ptr;
diff --git a/string/strcasecmp.c b/string/strcasecmp.c
index 6b14912..97c912e 100644
--- a/string/strcasecmp.c
+++ b/string/strcasecmp.c
@@ -34,21 +34,16 @@
#endif
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
-# define LOCALE_PARAM , loc
-# define LOCALE_PARAM_DECL __locale_t loc;
+# define LOCALE_PARAM , __locale_t loc
#else
# define LOCALE_PARAM
-# define LOCALE_PARAM_DECL
#endif
/* Compare S1 and S2, ignoring case, returning less than, equal to or
greater than zero if S1 is lexicographically less than,
equal to or greater than S2. */
int
-__strcasecmp (s1, s2 LOCALE_PARAM)
- const char *s1;
- const char *s2;
- LOCALE_PARAM_DECL
+__strcasecmp (const char *s1, const char *s2 LOCALE_PARAM)
{
#if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL
__locale_t loc = _NL_CURRENT_LOCALE;
diff --git a/string/strncase.c b/string/strncase.c
index a8fc046..0404d49 100644
--- a/string/strncase.c
+++ b/string/strncase.c
@@ -36,11 +36,9 @@
#endif
#ifdef USE_IN_EXTENDED_LOCALE_MODEL
-# define LOCALE_PARAM , loc
-# define LOCALE_PARAM_DECL __locale_t loc;
+# define LOCALE_PARAM , __locale_t loc
#else
# define LOCALE_PARAM
-# define LOCALE_PARAM_DECL
#endif
/* Compare no more than N characters of S1 and S2,
@@ -48,11 +46,7 @@
greater than zero if S1 is lexicographically less
than, equal to or greater than S2. */
int
-__strncasecmp (s1, s2, n LOCALE_PARAM)
- const char *s1;
- const char *s2;
- size_t n;
- LOCALE_PARAM_DECL
+__strncasecmp (const char *s1, const char *s2, size_t n LOCALE_PARAM)
{
#if defined _LIBC && !defined USE_IN_EXTENDED_LOCALE_MODEL
__locale_t loc = _NL_CURRENT_LOCALE;