diff options
| -rw-r--r-- | iconv/iconv_open.c | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/iconv/iconv_open.c b/iconv/iconv_open.c index 7f06947c9a..a9fe30cd98 100644 --- a/iconv/iconv_open.c +++ b/iconv/iconv_open.c @@ -1,5 +1,5 @@ /* Get descriptor for character set conversion. - Copyright (C) 1997, 1998, 1999, 2000 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -18,48 +18,13 @@ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <ctype.h> #include <errno.h> #include <iconv.h> #include <stdlib.h> #include <string.h> #include <gconv_int.h> - - -static inline void -strip (char *wp, const char *s) -{ - int slash_count = 0; - - while (*s != '\0') - { - if (isalnum (*s) || *s == '_' || *s == '-' || *s == '.') - *wp++ = toupper (*s); - else if (*s == '/') - { - if (++slash_count == 3) - break; - *wp++ = '/'; - } - ++s; - } - - while (slash_count++ < 2) - *wp++ = '/'; - - *wp = '\0'; -} - - -static char * -upstr (char *dst, const char *str) -{ - char *cp = dst; - while ((*cp++ = toupper (*str++)) != '\0') - /* nothing */; - return dst; -} +#include "gconv_charset.h" iconv_t |