luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-05 02:36:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

New function, doing the same as g_convert but taking a GIConv argument.

Browse Source 
2001-08-24  Alexander Larsson  <alla@lysator.liu.se>

	* glib/gconvert.[ch] (g_convert_with_iconv):
	New function, doing the same as g_convert but taking
	a GIConv argument. The old g_convert is just
	a call to this with a newly opened GIConv.
This commit is contained in:
Alexander Larsson 2001-08-25 03:22:16 +00:00 committed by Alexander Larsson
parent ed49b882bd
commit 1424212c3f
10 changed files with 117 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-0
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-12
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-2
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-4
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-6
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

7
ChangeLog.pre-2-8
View File

@ -1,3 +1,10 @@
2001-08-24 Alexander Larsson <alla@lysator.liu.se>
* glib/gconvert.[ch] (g_convert_with_iconv):
New function, doing the same as g_convert but taking
a GIConv argument. The old g_convert is just
a call to this with a newly opened GIConv.
2001-08-24 Darin Adler <darin@bentspoon.com>
* tests/shell-test.c: (check_string_result): Fix bad indenting.

66
glib/gconvert.c
View File

@ -186,15 +186,8 @@ g_convert (const gchar *str,
gsize *bytes_written,
GError **error)
{
gchar *dest;
gchar *outp;
const gchar *p;
gsize inbytes_remaining;
gsize outbytes_remaining;
gsize err;
gchar *res;
GIConv cd;
gsize outbuf_size;
gboolean have_error = FALSE;
g_return_val_if_fail (str != NULL, NULL);
g_return_val_if_fail (to_codeset != NULL, NULL);
@ -213,6 +206,59 @@ g_convert (const gchar *str,
return NULL;
}
res = g_convert_with_iconv (str, len, cd,
bytes_read, bytes_written,
error);
g_iconv_close (cd);
return res;
}
/**
* g_convert_with_iconv:
* @str: the string to convert
* @len: the length of the string
* @converter: conversion descriptor from g_iconv_open()
* @bytes_read: location to store the number of bytes in the
* input string that were successfully converted, or %NULL.
* Even if the conversion was succesful, this may be
* less than len if there were partial characters
* at the end of the input. If the error
* G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value
* stored will the byte fofset after the last valid
* input sequence.
* @bytes_written: the stored in the output buffer (not including the
* terminating nul.
* @error: location to store the error occuring, or %NULL to ignore
* errors. Any of the errors in #GConvertError may occur.
*
* Convert a string from one character set to another.
*
* Return value: If the conversion was successful, a newly allocated
* NUL-terminated string, which must be freed with
* g_free. Otherwise %NULL and @error will be set.
**/
gchar*
g_convert_with_iconv (const gchar *str,
gssize len,
GIConv converter,
gsize *bytes_read,
gsize *bytes_written,
GError **error)
{
gchar *dest;
gchar *outp;
const gchar *p;
gsize inbytes_remaining;
gsize outbytes_remaining;
gsize err;
gsize outbuf_size;
gboolean have_error = FALSE;
g_return_val_if_fail (str != NULL, NULL);
g_return_val_if_fail (converter != (GIConv) -1, NULL);
if (len < 0)
len = strlen (str);
@ -225,7 +271,7 @@ g_convert (const gchar *str,
again:
err = g_iconv (cd, (char **)&p, &inbytes_remaining, &outp, &outbytes_remaining);
err = g_iconv (converter, (char **)&p, &inbytes_remaining, &outp, &outbytes_remaining);
if (err == (size_t) -1)
{
@ -262,8 +308,6 @@ g_convert (const gchar *str,
*outp = '\0';
g_iconv_close (cd);
if (bytes_read)
*bytes_read = p - str;
else

6
glib/gconvert.h
View File

@ -64,6 +64,12 @@ gchar* g_convert (const gchar *str,
gsize *bytes_read,
gsize *bytes_written,
GError **error);
gchar* g_convert_with_iconv (const gchar *str,
gssize len,
GIConv converter,
gsize *bytes_read,
gsize *bytes_written,
GError **error);
gchar* g_convert_with_fallback (const gchar *str,
gssize len,
const gchar *to_codeset,