From 7eb95f50e380e785a18aaee6734807ee6db226a6 Mon Sep 17 00:00:00 2001 From: eadler Date: Tue, 22 Nov 2011 00:07:53 +0000 Subject: - add check for pointer equality prior to performing the O(n) pass - while here change 's' to 's1' in strcoll Submitted by: eadler@ Reviewed by: theraven@ Approved by: brooks@ MFC after: 2 weeks --- lib/libc/string/strcoll.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/libc/string/strcoll.c') diff --git a/lib/libc/string/strcoll.c b/lib/libc/string/strcoll.c index a918fca..8add885 100644 --- a/lib/libc/string/strcoll.c +++ b/lib/libc/string/strcoll.c @@ -40,7 +40,7 @@ __FBSDID("$FreeBSD$"); #include int -strcoll_l(const char *s, const char *s2, locale_t locale) +strcoll_l(const char *s1, const char *s2, locale_t locale) { int len, len2, prim, prim2, sec, sec2, ret, ret2; const char *t, *t2; @@ -50,16 +50,16 @@ strcoll_l(const char *s, const char *s2, locale_t locale) (struct xlocale_collate*)locale->components[XLC_COLLATE]; if (table->__collate_load_error) - return strcmp(s, s2); + return strcmp(s1, s2); len = len2 = 1; ret = ret2 = 0; if (table->__collate_substitute_nontrivial) { - t = tt = __collate_substitute(table, s); + t = tt = __collate_substitute(table, s1); t2 = tt2 = __collate_substitute(table, s2); } else { tt = tt2 = NULL; - t = s; + t = s1; t2 = s2; } while(*t && *t2) { @@ -95,8 +95,8 @@ strcoll_l(const char *s, const char *s2, locale_t locale) } int -strcoll(const char *s, const char *s2) +strcoll(const char *s1, const char *s2) { - return strcoll_l(s, s2, __get_locale()); + return strcoll_l(s1, s2, __get_locale()); } -- cgit v1.1