diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:54:16 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2004-03-05 10:54:16 +0000 |
| commit | 58845a7030dfca1812db98099cd7954c7449bac2 (patch) | |
| tree | e6cdcda157e52b49d33b62c736aeabba3900db81 | |
| parent | afdca0f2a3a18fb0dcfc334c205e0fb96e90e839 (diff) | |
| download | glibc-58845a7030dfca1812db98099cd7954c7449bac2.zip glibc-58845a7030dfca1812db98099cd7954c7449bac2.tar.gz glibc-58845a7030dfca1812db98099cd7954c7449bac2.tar.bz2 | |
Update.
* include/wctype.h: Add libc_hidden_proto for __towctrans.
* wctype/towctrans.c: Add libc_hidden_def.
* libio/memstream.c (open_memstream): Use _IO_init with INTUSE.
* posix/regexec.c (transit_state): Remove unused variable
next_state.
* posix/regcomp.c (init_dfa): Use __btowc instead of btowc.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | include/wctype.h | 1 | ||||
| -rw-r--r-- | libio/memstream.c | 2 | ||||
| -rw-r--r-- | posix/regcomp.c | 2 | ||||
| -rw-r--r-- | posix/regexec.c | 16 | ||||
| -rw-r--r-- | wctype/towctrans.c | 3 |
6 files changed, 23 insertions, 11 deletions
@@ -1,5 +1,15 @@ 2004-03-05 Ulrich Drepper <drepper@redhat.com> + * include/wctype.h: Add libc_hidden_proto for __towctrans. + * wctype/towctrans.c: Add libc_hidden_def. + + * libio/memstream.c (open_memstream): Use _IO_init with INTUSE. + + * posix/regexec.c (transit_state): Remove unused variable + next_state. + + * posix/regcomp.c (init_dfa): Use __btowc instead of btowc. + * sysdeps/generic/ldsodefs.h: Define new structure rtld_global_ro. Declare _rtld_global_ro and _rtld_local_ro. Move members of rtld_global structure into the new one if they are modified only diff --git a/include/wctype.h b/include/wctype.h index 2acaabd..a2d5e18 100644 --- a/include/wctype.h +++ b/include/wctype.h @@ -67,6 +67,7 @@ extern __typeof (iswxdigit_l) __iswxdigit_l; extern __typeof (towlower_l) __towlower_l; extern __typeof (towupper_l) __towupper_l; +libc_hidden_proto (__towctrans) libc_hidden_proto (__iswctype) libc_hidden_proto (__iswalnum_l) libc_hidden_proto (__iswalpha_l) diff --git a/libio/memstream.c b/libio/memstream.c index 8519832..8c12804 100644 --- a/libio/memstream.c +++ b/libio/memstream.c @@ -86,7 +86,7 @@ open_memstream (bufloc, sizeloc) buf = malloc (_IO_BUFSIZ); if (buf == NULL) return NULL; - _IO_init (&new_f->fp._sf._sbf._f, 0); + INTUSE(_IO_init) (&new_f->fp._sf._sbf._f, 0); _IO_JUMPS ((struct _IO_FILE_plus *) &new_f->fp._sf._sbf) = &_IO_mem_jumps; _IO_str_init_static_internal (&new_f->fp._sf, buf, _IO_BUFSIZ, buf); new_f->fp._sf._sbf._f._flags &= ~_IO_USER_BUF; diff --git a/posix/regcomp.c b/posix/regcomp.c index eccb93e..bc9e56b 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -867,7 +867,7 @@ init_dfa (dfa, pat_len) else for (i = 0, ch = 0; i < BITSET_UINTS; ++i) for (j = 0; j < UINT_BITS; ++j, ++ch) - if (btowc (ch) != WEOF) + if (__btowc (ch) != WEOF) dfa->sb_char[i] |= 1 << j; } #endif diff --git a/posix/regexec.c b/posix/regexec.c index 09142c5..ad62178 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -2148,7 +2148,7 @@ transit_state (err, mctx, state) re_dfastate_t *state; { re_dfa_t *const dfa = mctx->dfa; - re_dfastate_t **trtable, *next_state; + re_dfastate_t **trtable; unsigned char ch; if (re_string_cur_idx (&mctx->input) + 1 >= mctx->input.bufs_len @@ -2208,13 +2208,13 @@ transit_state (err, mctx, state) } /* Update the state_log if we need */ -re_dfastate_t * -merge_state_with_log (err, mctx, next_state) - reg_errcode_t *err; - re_match_context_t *mctx; - re_dfastate_t *next_state; -{ - re_dfa_t *const dfa = mctx->dfa; +re_dfastate_t * +merge_state_with_log (err, mctx, next_state) + reg_errcode_t *err; + re_match_context_t *mctx; + re_dfastate_t *next_state; +{ + re_dfa_t *const dfa = mctx->dfa; int cur_idx = re_string_cur_idx (&mctx->input); if (cur_idx > mctx->state_log_top) diff --git a/wctype/towctrans.c b/wctype/towctrans.c index 78ee3cb..6e3c466 100644 --- a/wctype/towctrans.c +++ b/wctype/towctrans.c @@ -1,5 +1,5 @@ /* Map wide character using given mapping. - Copyright (C) 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -32,4 +32,5 @@ __towctrans (wint_t wc, wctrans_t desc) return wctrans_table_lookup ((const char *) desc, wc); } +libc_hidden_def (__towctrans) weak_alias (__towctrans, towctrans) |