From 4acf4955f54c1fba30fdf2dc0dd4e11f6a3595b5 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 29 Oct 2014 10:53:49 -0700 Subject: Rename the strnatcmp.c routines and make them use the g_ascii_XXX() routines. Rename strnatcmp()/strnatcasecmp() to ws_ascii_XXX(), and make them use the g_ascii_XXX() routines rather than ctype.h routines, to eliminate locale-dependent behavior. (If you want locale-dependent "natural order" sorting, you probably want "dictionary order" sorting, which is more complicated than just natural order sorting.) Change-Id: I837f2776b2a909b547dc9a6072e497911b5380e5 Reviewed-on: https://code.wireshark.org/review/4985 Reviewed-by: Guy Harris --- mergecap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mergecap.c') diff --git a/mergecap.c b/mergecap.c index 94c8661252..31d7c5efda 100644 --- a/mergecap.c +++ b/mergecap.c @@ -149,8 +149,8 @@ string_compare(gconstpointer a, gconstpointer b) static gint string_nat_compare(gconstpointer a, gconstpointer b) { - return strnatcmp(((const struct string_elem *)a)->sstr, - ((const struct string_elem *)b)->sstr); + return ws_ascii_strnatcmp(((const struct string_elem *)a)->sstr, + ((const struct string_elem *)b)->sstr); } static void -- cgit v1.2.1