summaryrefslogtreecommitdiff
path: root/iconv
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-09-06 01:18:13 +0000
committerUlrich Drepper <drepper@redhat.com>2005-09-06 01:18:13 +0000
commitdbc92dc6cbb8f5faefbf2d9ff5ec578b1809310e (patch)
tree77b159fbc5443af7569dd9733dc92d05d8a768cc /iconv
parent45541bdf5cd8f9faf1b5e1ed995664eaf9a4e969 (diff)
downloadglibc-dbc92dc6cbb8f5faefbf2d9ff5ec578b1809310e.tar.gz
* configure.in: Compile source test file with -fPIC for -shared.
2005-09-05 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_mutex_lock_wait): Fix typo in register name.
Diffstat (limited to 'iconv')
-rw-r--r--iconv/skeleton.c10
1 files changed, 4 insertions, 6 deletions
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