From dbc92dc6cbb8f5faefbf2d9ff5ec578b1809310e Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 6 Sep 2005 01:18:13 +0000 Subject: * configure.in: Compile source test file with -fPIC for -shared. 2005-09-05 Kaz Kojima * sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_mutex_lock_wait): Fix typo in register name. --- iconv/skeleton.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'iconv/skeleton.c') diff --git a/iconv/skeleton.c b/iconv/skeleton.c index 278edb3f03..c74935693f 100644 --- a/iconv/skeleton.c +++ b/iconv/skeleton.c @@ -157,7 +157,7 @@ # endif #else # ifndef FROM_DIRECTION -# error "FROM_DIRECTION must be provided if direction objects are not used" +# error "FROM_DIRECTION must be provided if non-default init is used" # endif #endif @@ -673,8 +673,8 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, #ifdef RESET_INPUT_BUFFER RESET_INPUT_BUFFER; #else - /* We have a problem with the in on of the functions - below. Undo the conversion upto the error point. */ + /* We have a problem in one of the functions below. + Undo the conversion upto the error point. */ size_t nstatus; /* Reload the pointers. */ @@ -772,12 +772,11 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, STORE_REST # else - size_t cnt; - /* Make sure the remaining bytes fit into the state objects buffer. */ assert (inend - *inptrp < 4); + size_t cnt; for (cnt = 0; *inptrp < inend; ++cnt) data->__statep->__value.__wchb[cnt] = *(*inptrp)++; data->__statep->__count &= ~7; @@ -807,7 +806,6 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data, #undef TO_LOOP_MAX_NEEDED_FROM #undef TO_LOOP_MIN_NEEDED_TO #undef TO_LOOP_MAX_NEEDED_TO -#undef DEFINE_DIRECTION_OBJECTS #undef FROM_DIRECTION #undef EMIT_SHIFT_TO_INIT #undef FROM_LOOP -- cgit 1.4.1