From a334319f6530564d22e775935d9c91663623a1b4 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 22 Dec 2004 20:10:10 +0000 Subject: (CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4. --- locale/newlocale.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'locale/newlocale.c') diff --git a/locale/newlocale.c b/locale/newlocale.c index 0c31ba4..b646ffe 100644 --- a/locale/newlocale.c +++ b/locale/newlocale.c @@ -1,5 +1,5 @@ /* Return a reference to locale information record. - Copyright (C) 1996, 1997, 1999, 2000-2002, 2004, 2005, 2006 + Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -66,7 +66,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base) if (locale == NULL) ERROR_RETURN; - if (base == _nl_C_locobj_ptr) + if (base == &_nl_C_locobj) /* We're to modify BASE, returned for a previous call with "C". We can't really modify the read-only structure, so instead start over by copying it. */ @@ -75,7 +75,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base) if ((base == NULL || category_mask == (1 << __LC_LAST) - 1 - (1 << LC_ALL)) && (category_mask == 0 || !strcmp (locale, "C"))) /* Asking for the "C" locale needn't allocate a new object. */ - return _nl_C_locobj_ptr; + return &_nl_C_locobj; /* Allocate memory for the result. */ if (base != NULL) @@ -133,8 +133,7 @@ __newlocale (int category_mask, const char *locale, __locale_t base) for (cnt = 0; cnt < __LC_LAST; ++cnt) if (cnt != LC_ALL && (size_t) (cp - np) == _nl_category_name_sizes[cnt] - && memcmp (np, (_nl_category_names.str - + _nl_category_name_idxs[cnt]), cp - np) == 0) + && memcmp (np, _nl_category_names[cnt], cp - np) == 0) break; if (cnt == __LC_LAST) -- cgit v1.1