mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-10 03:16:17 +01:00
Document the (GIConv)-1 return value on failure. (#87559, Jarek Dukat)
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com> * glib/gconvert.c (g_iconv_open): Document the (GIConv)-1 return value on failure. (#87559, Jarek Dukat) * glib/gconvert.c (g_iconv_open): Fix potential problems with the assumption that (GIConv)(iconv_t)-1 is the same as (GIConv)-1.
This commit is contained in:
parent
0a064bd795
commit
2658448f76
10
ChangeLog
10
ChangeLog
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -1,3 +1,13 @@
|
||||
Thu Jul 25 17:57:07 2002 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Document the
|
||||
(GIConv)-1 return value on failure. (#87559,
|
||||
Jarek Dukat)
|
||||
|
||||
* glib/gconvert.c (g_iconv_open): Fix potential
|
||||
problems with the assumption that (GIConv)(iconv_t)-1
|
||||
is the same as (GIConv)-1.
|
||||
|
||||
2002-07-15 Matthias Clasen <maclas@gmx.de>
|
||||
|
||||
* glib/gmarkup.h:
|
||||
|
@ -102,7 +102,8 @@ extern const char **_g_charset_get_aliases (const char *canonical_name);
|
||||
* GLib provides g_convert() and g_locale_to_utf8() which are likely
|
||||
* more convenient than the raw iconv wrappers.
|
||||
*
|
||||
* Return value: a "conversion descriptor"
|
||||
* Return value: a "conversion descriptor", or (GIConv)-1 if
|
||||
* opening the converter failed.
|
||||
**/
|
||||
GIConv
|
||||
g_iconv_open (const gchar *to_codeset,
|
||||
@ -121,20 +122,20 @@ g_iconv_open (const gchar *to_codeset,
|
||||
while (*p)
|
||||
{
|
||||
if (try_conversion (to_codeset, *p, &cd))
|
||||
return (GIConv)cd;
|
||||
goto out;
|
||||
|
||||
if (try_to_aliases (to_aliases, *p, &cd))
|
||||
return (GIConv)cd;
|
||||
goto out;
|
||||
|
||||
p++;
|
||||
}
|
||||
}
|
||||
|
||||
if (try_to_aliases (to_aliases, from_codeset, &cd))
|
||||
return (GIConv)cd;
|
||||
goto out;
|
||||
}
|
||||
|
||||
return (GIConv)cd;
|
||||
return (cd == (iconv_t)-1) ? (GIConv)-1 : (GIConv)cd;
|
||||
}
|
||||
|
||||
/**
|
||||
|
Loading…
Reference in New Issue
Block a user