From 466618568dd9045eaf0e9ce505d1e2c9edd47243 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 13 Feb 2000 08:17:12 +0000 Subject: Update. 2000-02-12 Andreas Jaeger * 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. --- locale/programs/ld-collate.c | 2 +- locale/weightwc.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'locale') 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 -- cgit 1.4.1