Move the g_locale_get_codeset() up in the header file to correspond to to

Tue May 30 16:01:32 2000  Owen Taylor  <otaylor@redhat.com>

	* glib.h gutils.c: Move the g_locale_get_codeset() up in the
	header file to correspond to to comments about memory
	management. Rename to g_get_codeset() to avoid
	polluting the g_locale_* namespace, which probably
	would have g_locale_get_codeset (GLocale *locale).
	Add a doc comment.
This commit is contained in:
Owen Taylor 2000-05-30 20:05:23 +00:00 committed by Owen Taylor
parent 466305d0ca
commit e0b5636031
12 changed files with 96 additions and 6 deletions

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

View File

@ -1,3 +1,12 @@
Tue May 30 16:01:32 2000 Owen Taylor <otaylor@redhat.com>
* glib.h gutils.c: Move the g_locale_get_codeset() up in the
header file to correspond to to comments about memory
management. Rename to g_get_codeset() to avoid
polluting the g_locale_* namespace, which probably
would have g_locale_get_codeset (GLocale *locale).
Add a doc comment.
Mon May 29 14:10:35 2000 Owen Taylor <otaylor@redhat.com>
* gutils.c (g_locale_get_codeset): Add function to get the

5
glib.h
View File

@ -1708,12 +1708,13 @@ gchar* g_path_skip_root (gchar *file_name);
gchar* g_dirname (const gchar *file_name);
gchar* g_get_current_dir (void);
/* Get the codeset for the current locale */
gchar * g_get_codeset (void);
/* return the environment string for the variable. The returned memory
* must not be freed. */
gchar* g_getenv (const gchar *variable);
gchar * g_locale_get_codeset (void);
/* we use a GLib function as a replacement for ATEXIT, so
* the programmer is not required to check the return value
* (if there is any in the implementation) and doesn't encounter

View File

@ -1708,12 +1708,13 @@ gchar* g_path_skip_root (gchar *file_name);
gchar* g_dirname (const gchar *file_name);
gchar* g_get_current_dir (void);
/* Get the codeset for the current locale */
gchar * g_get_codeset (void);
/* return the environment string for the variable. The returned memory
* must not be freed. */
gchar* g_getenv (const gchar *variable);
gchar * g_locale_get_codeset (void);
/* we use a GLib function as a replacement for ATEXIT, so
* the programmer is not required to check the return value
* (if there is any in the implementation) and doesn't encounter

View File

@ -761,8 +761,16 @@ g_int_hash (gconstpointer v)
return *(const gint*) v;
}
/**
* g_get_codeset:
*
* Get the codeset for the current locale.
*
* Return value: a newly allocated string containing the name
* of the codeset. This string must be freed with g_free().
**/
gchar *
g_locale_get_codeset (void)
g_get_codeset (void)
{
#ifdef HAVE_CODESET
char *result = nl_langinfo (CODESET);

View File

@ -761,8 +761,16 @@ g_int_hash (gconstpointer v)
return *(const gint*) v;
}
/**
* g_get_codeset:
*
* Get the codeset for the current locale.
*
* Return value: a newly allocated string containing the name
* of the codeset. This string must be freed with g_free().
**/
gchar *
g_locale_get_codeset (void)
g_get_codeset (void)
{
#ifdef HAVE_CODESET
char *result = nl_langinfo (CODESET);