Libc-1082.50.1.tar.gz

[apple/libc.git] / locale / FreeBSD / fix_grouping.c

diff --git a/locale/FreeBSD/fix_grouping.c b/locale/FreeBSD/fix_grouping.c
index ab08f3f2cbd5cef2647340a837e8dcb6df49c3a0..180c80035b18a8f0accbf217c43e0a2b3d06f0a2 100644 (file)
--- a/locale/FreeBSD/fix_grouping.c
+++ b/locale/FreeBSD/fix_grouping.c
@@ -31,7 +31,8 @@ __FBSDID("$FreeBSD: src/lib/libc/locale/fix_grouping.c,v 1.8 2003/06/26 10:46:16
 #include <limits.h>
 #include <stddef.h>
 
 #include <limits.h>
 #include <stddef.h>
 

-static const char nogrouping[] = { CHAR_MAX, '\0' };
+static const char nogrouping[] = { '\0' };
+static const char __nogrouping[] = { CHAR_MAX, '\0' };

 
 /*
  * Internal helper used to convert grouping sequences from string
 
 /*
  * Internal helper used to convert grouping sequences from string


@@ -84,3 +85,14 @@ __fix_locale_grouping_str(const char *str)
        *dst = '\0';
        return str;
 }
        *dst = '\0';
        return str;
 }

+
+/*
+ * internal helpers for SUSv3 compatibility.  Since "nogrouping" needs to
+ * be just an empty string, we provide a routine to substitute __nogrouping
+ * so we don't have to modify code that expects CHAR_MAX.
+ */
+__private_extern__ const char *
+__fix_nogrouping(const char *str)
+{
+       return ((str == NULL || *str == '\0') ? __nogrouping : str);
+}