aboutsummaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-02-13 08:17:12 +0000
committerUlrich Drepper <drepper@redhat.com>2000-02-13 08:17:12 +0000
commit466618568dd9045eaf0e9ce505d1e2c9edd47243 (patch)
tree11c4502a190e76e3676178c79d90cdad12088fb7 /locale
parentb02b9253e0c1770707ed791f0aa274af79886932 (diff)
downloadglibc-466618568dd9045eaf0e9ce505d1e2c9edd47243.tar
glibc-466618568dd9045eaf0e9ce505d1e2c9edd47243.tar.gz
glibc-466618568dd9045eaf0e9ce505d1e2c9edd47243.tar.bz2
glibc-466618568dd9045eaf0e9ce505d1e2c9edd47243.zip
Update.
2000-02-12 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/i386/msgctl.c (__new_msgctl): Move errno declaration to place where it's needed to avoid compiler warning. * sysdeps/unix/sysv/linux/i386/semctl.c (__new_semctl): Likewise. * locale/weightwc.h (findidx): Correct find index value.
Diffstat (limited to 'locale')
-rw-r--r--locale/programs/ld-collate.c2
-rw-r--r--locale/weightwc.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/locale/programs/ld-collate.c b/locale/programs/ld-collate.c
index d3f13ada5b..d8363bd2ac 100644
--- a/locale/programs/ld-collate.c
+++ b/locale/programs/ld-collate.c
@@ -1548,7 +1548,7 @@ collate_finish (struct localedef_t *locale, struct charmap_t *charmap)
dont_insert:
}
- if (runp->wcs != NULL)
+ if (runp->used_in_level)
{
runp->wcorder = wcact++;
diff --git a/locale/weightwc.h b/locale/weightwc.h
index 9e5bcf7f4d..d0ca018e70 100644
--- a/locale/weightwc.h
+++ b/locale/weightwc.h
@@ -51,8 +51,7 @@ findidx (const wint_t **cpp)
const wint_t *usrc = *cpp;
/* The first thing is the index. */
- i = cp;
- ++cp;
+ i = *cp++;
/* Next is the length of the byte sequence. These are always
short byte sequences so there is no reason to call any