about summary refs log tree commit diff
path: root/posix
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-03-05 10:54:16 +0000
committerUlrich Drepper <drepper@redhat.com>2004-03-05 10:54:16 +0000
commit58845a7030dfca1812db98099cd7954c7449bac2 (patch)
treee6cdcda157e52b49d33b62c736aeabba3900db81 /posix
parentafdca0f2a3a18fb0dcfc334c205e0fb96e90e839 (diff)
downloadglibc-58845a7030dfca1812db98099cd7954c7449bac2.tar.gz
glibc-58845a7030dfca1812db98099cd7954c7449bac2.tar.xz
glibc-58845a7030dfca1812db98099cd7954c7449bac2.zip
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.
Diffstat (limited to 'posix')
-rw-r--r--posix/regcomp.c2
-rw-r--r--posix/regexec.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c
index eccb93e46e..bc9e56bd02 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 09142c5f7a..ad62178bbd 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)