diff options
| author | Werner Koch <[email protected]> | 2008-06-11 16:35:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2008-06-11 16:35:03 +0000 |
| commit | 8ed9eb4ac128360a97f12e2cce6436ea7653bfed (patch) | |
| tree | 6e050589ad02671bbb1158097c273f2b2205f7c5 /jnlib/utf8conv.c | |
| parent | Made --fixed-list-mode obsolete. (diff) | |
| download | gnupg-8ed9eb4ac128360a97f12e2cce6436ea7653bfed.tar.gz gnupg-8ed9eb4ac128360a97f12e2cce6436ea7653bfed.zip | |
Removed unused variable.
Diffstat (limited to '')
| -rw-r--r-- | jnlib/utf8conv.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/jnlib/utf8conv.c b/jnlib/utf8conv.c index 1b9c93dff..5223d473b 100644 --- a/jnlib/utf8conv.c +++ b/jnlib/utf8conv.c @@ -1,6 +1,6 @@ /* utf8conf.c - UTF8 character set conversion * Copyright (C) 1994, 1998, 1999, 2000, 2001, - * 2003, 2006 Free Software Foundation, Inc. + * 2003, 2006, 2008 Free Software Foundation, Inc. * * This file is part of JNLIB. * @@ -41,7 +41,6 @@ #endif static const char *active_charset_name = "iso-8859-1"; -static unsigned short *active_charset; static int no_translation; /* Set to true if we let simply pass through. */ static int use_iconv; /* iconv comversion fucntions required. */ @@ -142,7 +141,6 @@ handle_iconv_error (const char *to, const char *from, int use_fallback) default. */ active_charset_name = "iso-8859-1"; no_translation = 0; - active_charset = NULL; use_iconv = 0; } } @@ -262,7 +260,6 @@ set_native_charset (const char *newset) { active_charset_name = "iso-8859-1"; no_translation = 0; - active_charset = NULL; use_iconv = 0; } else if ( !ascii_strcasecmp (newset, "utf8" ) @@ -270,7 +267,6 @@ set_native_charset (const char *newset) { active_charset_name = "utf-8"; no_translation = 1; - active_charset = NULL; use_iconv = 0; } else @@ -298,7 +294,6 @@ set_native_charset (const char *newset) iconv_close (cd); active_charset_name = full_newset; no_translation = 0; - active_charset = NULL; use_iconv = 1; } return 0; @@ -334,7 +329,7 @@ native_to_utf8 (const char *orig_string) /* Already utf-8 encoded. */ buffer = jnlib_xstrdup (orig_string); } - else if (!active_charset && !use_iconv) + else if (!use_iconv) { /* For Latin-1 we can avoid the iconv overhead. */ for (s = string; *s; s++) |