diff options
| author | Andreas Jaeger <aj@suse.de> | 2004-02-07 15:56:44 +0000 |
|---|---|---|
| committer | Andreas Jaeger <aj@suse.de> | 2004-02-07 15:56:44 +0000 |
| commit | cdda3d7dea4a3772dbe61b74aa49f83d98082689 (patch) | |
| tree | 682ebd3aed2469ab732d9ff5d60fe54af0e0bc9a /iconv/gconv_open.c | |
| parent | acd262e611f704a7ae47101bec76c22d89a2401a (diff) | |
| download | glibc-cdda3d7dea4a3772dbe61b74aa49f83d98082689.tar.gz glibc-cdda3d7dea4a3772dbe61b74aa49f83d98082689.tar.xz glibc-cdda3d7dea4a3772dbe61b74aa49f83d98082689.zip | |
* iconv/gconv_simple.c (ucs4le_internal_loop): Remove cast used as
lvalue. (internal_ucs4le_loop_single): Likewise. (ucs4_internal_loop): Likewise. (BODY): Likewise. (internal_ucs4_loop_single): Likewise.
Diffstat (limited to 'iconv/gconv_open.c')
| -rw-r--r-- | iconv/gconv_open.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/iconv/gconv_open.c b/iconv/gconv_open.c index 94a54f8008..90da784f78 100644 --- a/iconv/gconv_open.c +++ b/iconv/gconv_open.c @@ -1,5 +1,5 @@ /* Find matching transformation algorithms and initialize steps. - Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -182,8 +182,13 @@ __gconv_open (const char *toset, const char *fromset, __gconv_t *handle, || __builtin_expect (__gconv_translit_find (runp), 0) == 0) lastp = runp; else - /* This means we haven't found the module. Remove it. */ - (lastp == NULL ? trans : lastp->next) = runp->next; + { + /* This means we haven't found the module. Remove it. */ + if (lastp == NULL) + trans = runp->next; + else + lastp->next = runp->next; + } } /* Allocate room for handle. */ |