diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-02-26 01:32:44 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-02-26 01:32:44 +0000 |
| commit | 17568537740cb4bbeb28608a8ae6ba7a4fcf80c9 (patch) | |
| tree | add616e1fb16331a69de439dd513ae6b13625f0a /posix | |
| parent | d024596d616ed20e04dcfacc06bd77d8d1e2b64b (diff) | |
| download | glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.gz glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.tar.bz2 glibc-17568537740cb4bbeb28608a8ae6ba7a4fcf80c9.zip | |
Update.
2004-02-24 Arnold D. Robbins <arnold@skeeve.com>
* posix/regex_internal.c (build_wcs_upper_buffer): Enclose
`offsets_needed' label in `#ifdef _LIBC' to silence `unused label'
compiler warning.
2004-02-24 Nelson H.F. Beebe <beebe@math.utah.edu>
* posix/regex_internal.c (build_wcs_buffer): Add cast to char* in call
to `wcrtomb'.
* posix/regex_internal.h (bitset_not, bitset_merge, bitset_not_merge,
bitset_mask, re_string_char_size_a, re_string_wchar_at,
re_string_elem_size_at): Change to use prototypes.
(re_string_char_size_at, re_string_wchar_at,
re_string_elem_size_at): Declare as `internal_function'.
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/regex_internal.c | 4 | ||||
| -rw-r--r-- | posix/regex_internal.h | 30 |
2 files changed, 13 insertions, 21 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c index ed26908ad1..a3dcfbbb65 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -373,7 +373,9 @@ build_wcs_upper_buffer (pstr) { wchar_t wc; const char *p; +#ifdef _LIBC offsets_needed: +#endif remain_len = end_idx - byte_idx; prev_st = pstr->cur_state; if (BE (pstr->trans != NULL, 0)) @@ -398,7 +400,7 @@ offsets_needed: int mbcdlen; wcu = towupper (wc); - mbcdlen = wcrtomb (buf, wcu, &prev_st); + mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); else diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 7ec7294692..d7d7d9a8b1 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -708,8 +708,7 @@ typedef struct /* Inline functions for bitset operation. */ static inline void -bitset_not (set) - bitset set; +bitset_not (bitset set) { int bitset_i; for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i) @@ -717,9 +716,7 @@ bitset_not (set) } static inline void -bitset_merge (dest, src) - bitset dest; - const bitset src; +bitset_merge (bitset dest, const bitset src) { int bitset_i; for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i) @@ -727,9 +724,7 @@ bitset_merge (dest, src) } static inline void -bitset_not_merge (dest, src) - bitset dest; - const bitset src; +bitset_not_merge (bitset dest, const bitset src) { int i; for (i = 0; i < BITSET_UINTS; ++i) @@ -737,9 +732,7 @@ bitset_not_merge (dest, src) } static inline void -bitset_mask (dest, src) - bitset dest; - const bitset src; +bitset_mask (bitset dest, const bitset src) { int bitset_i; for (bitset_i = 0; bitset_i < BITSET_UINTS; ++bitset_i) @@ -749,9 +742,8 @@ bitset_mask (dest, src) #if defined RE_ENABLE_I18N && !defined RE_NO_INTERNAL_PROTOTYPES /* Inline functions for re_string. */ static inline int -re_string_char_size_at (pstr, idx) - const re_string_t *pstr; - int idx; +internal_function +re_string_char_size_at (const re_string_t *pstr, int idx) { int byte_idx; if (pstr->mb_cur_max == 1) @@ -763,9 +755,8 @@ re_string_char_size_at (pstr, idx) } static inline wint_t -re_string_wchar_at (pstr, idx) - const re_string_t *pstr; - int idx; +internal_function +re_string_wchar_at (const re_string_t *pstr, int idx) { if (pstr->mb_cur_max == 1) return (wint_t) pstr->mbs[idx]; @@ -773,9 +764,8 @@ re_string_wchar_at (pstr, idx) } static int -re_string_elem_size_at (pstr, idx) - const re_string_t *pstr; - int idx; +internal_function +re_string_elem_size_at (const re_string_t *pstr, int idx) { #ifdef _LIBC const unsigned char *p, *extra; |