aboutsummaryrefslogtreecommitdiff
path: root/iconv/iconv_open.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-04-06 17:32:18 +0000
committerUlrich Drepper <drepper@redhat.com>2001-04-06 17:32:18 +0000
commitee62473f2bd030dc42b601c06dae78e69b6cdaec (patch)
treed4018af3377f445c7f6bc41183f415cd1b46a30b /iconv/iconv_open.c
parentf4964b5cd47224bf63efe898ec450529d3400c4f (diff)
downloadglibc-ee62473f2bd030dc42b601c06dae78e69b6cdaec.tar
glibc-ee62473f2bd030dc42b601c06dae78e69b6cdaec.tar.gz
glibc-ee62473f2bd030dc42b601c06dae78e69b6cdaec.tar.bz2
glibc-ee62473f2bd030dc42b601c06dae78e69b6cdaec.zip
Move strip and upstr definitions into gconv_charset.h.
Diffstat (limited to 'iconv/iconv_open.c')
-rw-r--r--iconv/iconv_open.c39
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