luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-25 15:06:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove all uses of G_CONST_RETURN

Browse Source 
Just use 'const'.
This commit is contained in:
Ryan Lortie 2011-03-12 21:50:45 -05:00
parent 61b0e1c8d4
commit 36741245cc
35 changed files with 122 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
glib/gchecksum.c
View File

@ -1289,7 +1289,7 @@ g_checksum_update (GChecksum *checksum,
* *
* Since: 2.16 * Since: 2.16
*/ */
G_CONST_RETURN gchar * const gchar *
g_checksum_get_string (GChecksum *checksum) g_checksum_get_string (GChecksum *checksum)
{ {
gchar *str = NULL; gchar *str = NULL;

2
glib/gchecksum.h
View File

@ -69,7 +69,7 @@ void g_checksum_free (GChecksum *checksum);
void g_checksum_update (GChecksum *checksum, void g_checksum_update (GChecksum *checksum,
const guchar *data, const guchar *data,
gssize length); gssize length);
G_CONST_RETURN gchar *g_checksum_get_string (GChecksum *checksum); const gchar * g_checksum_get_string (GChecksum *checksum);
void g_checksum_get_digest (GChecksum *checksum, void g_checksum_get_digest (GChecksum *checksum,
guint8 *buffer, guint8 *buffer,
gsize *digest_len); gsize *digest_len);

4
glib/gconvert.c
View File

@ -1318,7 +1318,7 @@ filename_charset_cache_free (gpointer data)
* Since: 2.6 * Since: 2.6
*/ */
gboolean gboolean
g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) g_get_filename_charsets (const gchar ***filename_charsets)
{ {
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT; static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
GFilenameCharsetCache *cache = g_static_private_get (&cache_private); GFilenameCharsetCache *cache = g_static_private_get (&cache_private);
@ -1383,7 +1383,7 @@ g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
#else /* G_PLATFORM_WIN32 */ #else /* G_PLATFORM_WIN32 */
gboolean gboolean
g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets) g_get_filename_charsets (const gchar ***filename_charsets)
{ {
static const gchar *charsets[] = { static const gchar *charsets[] = {
"UTF-8", "UTF-8",

2
glib/gconvert.h
View File

@ -151,7 +151,7 @@ gchar *g_filename_to_uri (const gchar *filename,
const gchar *hostname, const gchar *hostname,
GError **error) G_GNUC_MALLOC; GError **error) G_GNUC_MALLOC;
gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC; gchar *g_filename_display_name (const gchar *filename) G_GNUC_MALLOC;
gboolean g_get_filename_charsets (G_CONST_RETURN gchar ***charsets); gboolean g_get_filename_charsets (const gchar ***charsets);
gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC; gchar *g_filename_display_basename (const gchar *filename) G_GNUC_MALLOC;

6
glib/gdataset.c
View File

@ -1129,7 +1129,7 @@ g_quark_from_static_string (const gchar *string)
* *
* Gets the string associated with the given #GQuark. * Gets the string associated with the given #GQuark.
**/ **/
G_CONST_RETURN gchar* const gchar *
g_quark_to_string (GQuark quark) g_quark_to_string (GQuark quark)
{ {
gchar* result = NULL; gchar* result = NULL;
@ -1175,7 +1175,7 @@ g_quark_new (gchar *string)
* *
* Since: 2.10 * Since: 2.10
*/ */
G_CONST_RETURN gchar* const gchar *
g_intern_string (const gchar *string) g_intern_string (const gchar *string)
{ {
const gchar *result; const gchar *result;
@ -1205,7 +1205,7 @@ g_intern_string (const gchar *string)
* *
* Since: 2.10 * Since: 2.10
*/ */
G_CONST_RETURN gchar* const gchar *
g_intern_static_string (const gchar *string) g_intern_static_string (const gchar *string)
{ {
GQuark quark; GQuark quark;

4
glib/gdir.c
View File

@ -194,7 +194,7 @@ g_dir_open (const gchar *path,
* more entries. The return value is owned by GLib and * more entries. The return value is owned by GLib and
* must not be modified or freed. * must not be modified or freed.
**/ **/
G_CONST_RETURN gchar* const gchar *
g_dir_read_name (GDir *dir) g_dir_read_name (GDir *dir)
{ {
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
@ -250,7 +250,7 @@ g_dir_read_name (GDir *dir)
/* Binary compatibility version. Not for newly compiled code. */ /* Binary compatibility version. Not for newly compiled code. */
G_CONST_RETURN gchar* const gchar *
g_dir_read_name (GDir *dir) g_dir_read_name (GDir *dir)
{ {
while (1) while (1)

2
glib/gdir.h
View File

@ -43,7 +43,7 @@ typedef struct _GDir GDir;
GDir * g_dir_open (const gchar *path, GDir * g_dir_open (const gchar *path,
guint flags, guint flags,
GError **error); GError **error);
G_CONST_RETURN gchar *g_dir_read_name (GDir *dir); const gchar * g_dir_read_name (GDir *dir);
void g_dir_rewind (GDir *dir); void g_dir_rewind (GDir *dir);
void g_dir_close (GDir *dir); void g_dir_close (GDir *dir);

4
glib/giochannel.c
View File

@ -920,7 +920,7 @@ g_io_channel_set_line_term (GIOChannel *channel,
* Return value: The line termination string. This value * Return value: The line termination string. This value
* is owned by GLib and must not be freed. * is owned by GLib and must not be freed.
**/ **/
G_CONST_RETURN gchar* const gchar *
g_io_channel_get_line_term (GIOChannel *channel, g_io_channel_get_line_term (GIOChannel *channel,
gint *length) gint *length)
{ {
@ -1458,7 +1458,7 @@ g_io_channel_set_encoding (GIOChannel *channel,
* Return value: A string containing the encoding, this string is * Return value: A string containing the encoding, this string is
* owned by GLib and must not be freed. * owned by GLib and must not be freed.
**/ **/
G_CONST_RETURN gchar* const gchar *
g_io_channel_get_encoding (GIOChannel *channel) g_io_channel_get_encoding (GIOChannel *channel)
{ {
g_return_val_if_fail (channel != NULL, NULL); g_return_val_if_fail (channel != NULL, NULL);

4
glib/giochannel.h
View File

@ -215,7 +215,7 @@ GIOFlags g_io_channel_get_flags (GIOChannel *channel);
void g_io_channel_set_line_term (GIOChannel *channel, void g_io_channel_set_line_term (GIOChannel *channel,
const gchar *line_term, const gchar *line_term,
gint length); gint length);
G_CONST_RETURN gchar* g_io_channel_get_line_term (GIOChannel *channel, const gchar * g_io_channel_get_line_term (GIOChannel *channel,
gint *length); gint *length);
void g_io_channel_set_buffered (GIOChannel *channel, void g_io_channel_set_buffered (GIOChannel *channel,
gboolean buffered); gboolean buffered);
@ -223,7 +223,7 @@ gboolean g_io_channel_get_buffered (GIOChannel *channel);
GIOStatus g_io_channel_set_encoding (GIOChannel *channel, GIOStatus g_io_channel_set_encoding (GIOChannel *channel,
const gchar *encoding, const gchar *encoding,
GError **error); GError **error);
G_CONST_RETURN gchar* g_io_channel_get_encoding (GIOChannel *channel); const gchar * g_io_channel_get_encoding (GIOChannel *channel);
void g_io_channel_set_close_on_unref (GIOChannel *channel, void g_io_channel_set_close_on_unref (GIOChannel *channel,
gboolean do_close); gboolean do_close);
gboolean g_io_channel_get_close_on_unref (GIOChannel *channel); gboolean g_io_channel_get_close_on_unref (GIOChannel *channel);

6
glib/glibintl.h
View File

@ -5,9 +5,9 @@
#error "config.h must be included prior to glibintl.h" #error "config.h must be included prior to glibintl.h"
#endif #endif
G_CONST_RETURN gchar *glib_gettext (const gchar *str) G_GNUC_FORMAT(1); const gchar * glib_gettext (const gchar *str) G_GNUC_FORMAT(1);
G_CONST_RETURN gchar *glib_pgettext (const gchar *msgctxtid, const gchar * glib_pgettext (const gchar *msgctxtid,
gsize msgidoffset) G_GNUC_FORMAT(1); gsize msgidoffset) G_GNUC_FORMAT(1);
#ifdef ENABLE_NLS #ifdef ENABLE_NLS

2
glib/gmain.c
View File

@ -1591,7 +1591,7 @@ g_source_set_name (GSource *source,
* Return value: the name of the source * Return value: the name of the source
* Since: 2.26 * Since: 2.26
**/ **/
G_CONST_RETURN char* const char *
g_source_get_name (GSource *source) g_source_get_name (GSource *source)
{ {
g_return_val_if_fail (source != NULL, NULL); g_return_val_if_fail (source != NULL, NULL);

2
glib/gmain.h
View File

@ -350,7 +350,7 @@ gboolean g_source_is_destroyed (GSource *source);
void g_source_set_name (GSource *source, void g_source_set_name (GSource *source,
const char *name); const char *name);
G_CONST_RETURN char* g_source_get_name (GSource *source); const char * g_source_get_name (GSource *source);
void g_source_set_name_by_id (guint tag, void g_source_set_name_by_id (guint tag,
const char *name); const char *name);

4
glib/gmarkup.c
View File

@ -1819,7 +1819,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
* *
* Since: 2.2 * Since: 2.2
*/ */
G_CONST_RETURN gchar * const gchar *
g_markup_parse_context_get_element (GMarkupParseContext *context) g_markup_parse_context_get_element (GMarkupParseContext *context)
{ {
g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (context != NULL, NULL);
@ -1850,7 +1850,7 @@ g_markup_parse_context_get_element (GMarkupParseContext *context)
* *
* Since: 2.16 * Since: 2.16
*/ */
G_CONST_RETURN GSList * const GSList *
g_markup_parse_context_get_element_stack (GMarkupParseContext *context) g_markup_parse_context_get_element_stack (GMarkupParseContext *context)
{ {
g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (context != NULL, NULL);

4
glib/gmarkup.h
View File

@ -194,8 +194,8 @@ gpointer g_markup_parse_context_pop (GMarkupParseContext *context)
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context, gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
GError **error); GError **error);
G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context); const gchar * g_markup_parse_context_get_element (GMarkupParseContext *context);
G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context); const GSList * g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
/* For user-constructed error messages, has no precise semantics */ /* For user-constructed error messages, has no precise semantics */
void g_markup_parse_context_get_position (GMarkupParseContext *context, void g_markup_parse_context_get_position (GMarkupParseContext *context,

4
glib/goption.c
View File

@ -2346,7 +2346,7 @@ g_option_context_set_summary (GOptionContext *context,
* *
* Since: 2.12 * Since: 2.12
*/ */
G_CONST_RETURN gchar * const gchar *
g_option_context_get_summary (GOptionContext *context) g_option_context_get_summary (GOptionContext *context)
{ {
g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (context != NULL, NULL);
@ -2390,7 +2390,7 @@ g_option_context_set_description (GOptionContext *context,
* *
* Since: 2.12 * Since: 2.12
*/ */
G_CONST_RETURN gchar * const gchar *
g_option_context_get_description (GOptionContext *context) g_option_context_get_description (GOptionContext *context)
{ {
g_return_val_if_fail (context != NULL, NULL); g_return_val_if_fail (context != NULL, NULL);

4
glib/goption.h
View File

@ -310,10 +310,10 @@ struct _GOptionEntry
GOptionContext *g_option_context_new (const gchar *parameter_string); GOptionContext *g_option_context_new (const gchar *parameter_string);
void g_option_context_set_summary (GOptionContext *context, void g_option_context_set_summary (GOptionContext *context,
const gchar *summary); const gchar *summary);
G_CONST_RETURN gchar *g_option_context_get_summary (GOptionContext *context); const gchar * g_option_context_get_summary (GOptionContext *context);
void g_option_context_set_description (GOptionContext *context, void g_option_context_set_description (GOptionContext *context,
const gchar *description); const gchar *description);
G_CONST_RETURN gchar *g_option_context_get_description (GOptionContext *context); const gchar * g_option_context_get_description (GOptionContext *context);
void g_option_context_free (GOptionContext *context); void g_option_context_free (GOptionContext *context);
void g_option_context_set_help_enabled (GOptionContext *context, void g_option_context_set_help_enabled (GOptionContext *context,
gboolean help_enabled); gboolean help_enabled);

6
glib/gquark.h
View File

@ -42,10 +42,10 @@ typedef guint32 GQuark;
GQuark g_quark_try_string (const gchar *string); GQuark g_quark_try_string (const gchar *string);
GQuark g_quark_from_static_string (const gchar *string); GQuark g_quark_from_static_string (const gchar *string);
GQuark g_quark_from_string (const gchar *string); GQuark g_quark_from_string (const gchar *string);
G_CONST_RETURN gchar* g_quark_to_string (GQuark quark) G_GNUC_CONST; const gchar * g_quark_to_string (GQuark quark) G_GNUC_CONST;
G_CONST_RETURN gchar* g_intern_string (const gchar *string); const gchar * g_intern_string (const gchar *string);
G_CONST_RETURN gchar* g_intern_static_string (const gchar *string); const gchar * g_intern_static_string (const gchar *string);
G_END_DECLS G_END_DECLS

16
glib/gstrfuncs.c
View File

@ -933,7 +933,7 @@ g_ascii_strtoll (const gchar *nptr,
* is unknown, it returns "unknown error (<code>)". The string * is unknown, it returns "unknown error (<code>)". The string
* can only be used until the next call to g_strerror() * can only be used until the next call to g_strerror()
*/ */
G_CONST_RETURN gchar* const gchar *
g_strerror (gint errnum) g_strerror (gint errnum)
{ {
static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT; static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
@ -1414,7 +1414,7 @@ g_strerror (gint errnum)
* it returns "unknown signal (<signum>)". The string can only be * it returns "unknown signal (<signum>)". The string can only be
* used until the next call to g_strsignal() * used until the next call to g_strsignal()
*/ */
G_CONST_RETURN gchar* const gchar *
g_strsignal (gint signum) g_strsignal (gint signum)
{ {
static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT; static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
@ -2968,7 +2968,7 @@ g_str_has_prefix (const gchar *str,
* *
* Since: 2.4 * Since: 2.4
**/ **/
G_CONST_RETURN gchar * const gchar *
g_strip_context (const gchar *msgid, g_strip_context (const gchar *msgid,
const gchar *msgval) const gchar *msgval)
{ {
@ -3034,7 +3034,7 @@ g_strv_length (gchar **str_array)
* *
* Since: 2.16 * Since: 2.16
*/ */
G_CONST_RETURN gchar * const gchar *
g_dpgettext (const gchar *domain, g_dpgettext (const gchar *domain,
const gchar *msgctxtid, const gchar *msgctxtid,
gsize msgidoffset) gsize msgidoffset)
@ -3095,7 +3095,7 @@ g_dpgettext (const gchar *domain,
* *
* Since: 2.18 * Since: 2.18
*/ */
G_CONST_RETURN char * const char *
g_dpgettext2 (const char *domain, g_dpgettext2 (const char *domain,
const char *msgctxt, const char *msgctxt,
const char *msgid) const char *msgid)
@ -3216,7 +3216,7 @@ _g_dgettext_should_translate (void)
* *
* Since: 2.18 * Since: 2.18
*/ */
G_CONST_RETURN gchar * const gchar *
g_dgettext (const gchar *domain, g_dgettext (const gchar *domain,
const gchar *msgid) const gchar *msgid)
{ {
@ -3242,7 +3242,7 @@ g_dgettext (const gchar *domain,
* *
* Since: 2.26 * Since: 2.26
*/ */
G_CONST_RETURN gchar * const gchar *
g_dcgettext (const gchar *domain, g_dcgettext (const gchar *domain,
const gchar *msgid, const gchar *msgid,
int category) int category)
@ -3272,7 +3272,7 @@ g_dcgettext (const gchar *domain,
* *
* Since: 2.18 * Since: 2.18
*/ */
G_CONST_RETURN gchar * const gchar *
g_dngettext (const gchar *domain, g_dngettext (const gchar *domain,
const gchar *msgid, const gchar *msgid,
const gchar *msgid_plural, const gchar *msgid_plural,

18
glib/gstrfuncs.h
View File

@ -103,9 +103,9 @@ gchar* g_strdelimit (gchar *string,
gchar* g_strcanon (gchar *string, gchar* g_strcanon (gchar *string,
const gchar *valid_chars, const gchar *valid_chars,
gchar substitutor); gchar substitutor);
G_CONST_RETURN gchar* g_strerror (gint errnum) G_GNUC_CONST; const gchar * g_strerror (gint errnum) G_GNUC_CONST;
G_CONST_RETURN gchar* g_strsignal (gint signum) G_GNUC_CONST; const gchar * g_strsignal (gint signum) G_GNUC_CONST;
gchar* g_strreverse (gchar *string); gchar * g_strreverse (gchar *string);
gsize g_strlcpy (gchar *dest, gsize g_strlcpy (gchar *dest,
const gchar *src, const gchar *src,
gsize dest_size); gsize dest_size);
@ -245,22 +245,22 @@ guint g_strv_length (gchar **str_array);
gchar* g_stpcpy (gchar *dest, gchar* g_stpcpy (gchar *dest,
const char *src); const char *src);
G_CONST_RETURN gchar *g_strip_context (const gchar *msgid, const gchar * g_strip_context (const gchar *msgid,
const gchar *msgval) G_GNUC_FORMAT(1); const gchar *msgval) G_GNUC_FORMAT(1);
G_CONST_RETURN gchar *g_dgettext (const gchar *domain, const gchar * g_dgettext (const gchar *domain,
const gchar *msgid) G_GNUC_FORMAT(2); const gchar *msgid) G_GNUC_FORMAT(2);
G_CONST_RETURN gchar *g_dcgettext (const gchar *domain, const gchar * g_dcgettext (const gchar *domain,
const gchar *msgid, const gchar *msgid,
int category) G_GNUC_FORMAT(2); int category) G_GNUC_FORMAT(2);
G_CONST_RETURN gchar *g_dngettext (const gchar *domain, const gchar * g_dngettext (const gchar *domain,
const gchar *msgid, const gchar *msgid,
const gchar *msgid_plural, const gchar *msgid_plural,
gulong n) G_GNUC_FORMAT(3); gulong n) G_GNUC_FORMAT(3);
G_CONST_RETURN gchar *g_dpgettext (const gchar *domain, const gchar * g_dpgettext (const gchar *domain,
const gchar *msgctxtid, const gchar *msgctxtid,
gsize msgidoffset) G_GNUC_FORMAT(2); gsize msgidoffset) G_GNUC_FORMAT(2);
G_CONST_RETURN gchar *g_dpgettext2 (const gchar *domain, const gchar * g_dpgettext2 (const gchar *domain,
const gchar *context, const gchar *context,
const gchar *msgid) G_GNUC_FORMAT(3); const gchar *msgid) G_GNUC_FORMAT(3);

2
glib/gunicode.h
View File

@ -236,7 +236,7 @@ typedef enum
* in case the locale's charset will be changed later using setlocale() * in case the locale's charset will be changed later using setlocale()
* or in some other way. * or in some other way.
*/ */
gboolean g_get_charset (G_CONST_RETURN char **charset); gboolean g_get_charset (const char **charset);
/* These are all analogs of the <ctype.h> functions. /* These are all analogs of the <ctype.h> functions.
*/ */

2
glib/gutf8.c
View File

@ -553,7 +553,7 @@ charset_cache_free (gpointer data)
* Return value: %TRUE if the returned charset is UTF-8 * Return value: %TRUE if the returned charset is UTF-8
**/ **/
gboolean gboolean
g_get_charset (G_CONST_RETURN char **charset) g_get_charset (const char **charset)
{ {
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT; static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
GCharsetCache *cache = g_static_private_get (&cache_private); GCharsetCache *cache = g_static_private_get (&cache_private);

56
glib/gutils.c
View File

@ -711,7 +711,7 @@ g_parse_debug_string (const gchar *string,
* g_path_get_basename() allocates new memory for the returned string, unlike * g_path_get_basename() allocates new memory for the returned string, unlike
* this function which returns a pointer into the argument. * this function which returns a pointer into the argument.
**/ **/
G_CONST_RETURN gchar* const gchar *
g_basename (const gchar *file_name) g_basename (const gchar *file_name)
{ {
register gchar *base; register gchar *base;
@ -857,7 +857,7 @@ g_path_is_absolute (const gchar *file_name)
* *
* Returns: a pointer into @file_name after the root component. * Returns: a pointer into @file_name after the root component.
*/ */
G_CONST_RETURN gchar* const gchar *
g_path_skip_root (const gchar *file_name) g_path_skip_root (const gchar *file_name)
{ {
g_return_val_if_fail (file_name != NULL, NULL); g_return_val_if_fail (file_name != NULL, NULL);
@ -1108,7 +1108,7 @@ g_get_current_dir (void)
* overwritten by the next call to g_getenv(), g_setenv() or * overwritten by the next call to g_getenv(), g_setenv() or
* g_unsetenv(). * g_unsetenv().
**/ **/
G_CONST_RETURN gchar* const gchar *
g_getenv (const gchar *variable) g_getenv (const gchar *variable)
{ {
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
@ -1872,7 +1872,7 @@ g_get_any_init_locked (void)
* *
* Returns: the user name of the current user. * Returns: the user name of the current user.
*/ */
G_CONST_RETURN gchar* const gchar *
g_get_user_name (void) g_get_user_name (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -1890,7 +1890,7 @@ g_get_user_name (void)
* *
* Returns: the user's real name. * Returns: the user's real name.
*/ */
G_CONST_RETURN gchar* const gchar *
g_get_real_name (void) g_get_real_name (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -1928,7 +1928,7 @@ g_get_real_name (void)
* *
* Returns: the current user's home directory * Returns: the current user's home directory
*/ */
G_CONST_RETURN gchar* const gchar *
g_get_home_dir (void) g_get_home_dir (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -1947,7 +1947,7 @@ g_get_home_dir (void)
* *
* Returns: the directory to use for temporary files. * Returns: the directory to use for temporary files.
*/ */
G_CONST_RETURN gchar* const gchar *
g_get_tmp_dir (void) g_get_tmp_dir (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -2066,7 +2066,7 @@ static gchar *g_application_name = NULL;
* *
* Since: 2.2 * Since: 2.2
**/ **/
G_CONST_RETURN gchar* const gchar *
g_get_application_name (void) g_get_application_name (void)
{ {
gchar* retval; gchar* retval;
@ -2135,7 +2135,7 @@ g_set_application_name (const gchar *application_name)
* or freed. * or freed.
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar* const gchar *
g_get_user_data_dir (void) g_get_user_data_dir (void)
{ {
gchar *data_dir; gchar *data_dir;
@ -2223,7 +2223,7 @@ g_init_user_config_dir (void)
* or freed. * or freed.
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar* const gchar *
g_get_user_config_dir (void) g_get_user_config_dir (void)
{ {
G_LOCK (g_utils_global); G_LOCK (g_utils_global);
@ -2255,7 +2255,7 @@ g_get_user_config_dir (void)
* or freed. * or freed.
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar* const gchar *
g_get_user_cache_dir (void) g_get_user_cache_dir (void)
{ {
gchar *cache_dir; gchar *cache_dir;
@ -2700,7 +2700,7 @@ g_reload_user_special_dirs_cache (void)
* *
* Since: 2.14 * Since: 2.14
*/ */
G_CONST_RETURN gchar * const gchar *
g_get_user_special_dir (GUserDirectory directory) g_get_user_special_dir (GUserDirectory directory)
{ {
g_return_val_if_fail (directory >= G_USER_DIRECTORY_DESKTOP && g_return_val_if_fail (directory >= G_USER_DIRECTORY_DESKTOP &&
@ -2785,7 +2785,7 @@ get_module_share_dir (gconstpointer address)
return retval; return retval;
} }
G_CONST_RETURN gchar * G_CONST_RETURN * const gchar * const *
g_win32_get_system_data_dirs_for_module (void (*address_of_function)()) g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
{ {
GArray *data_dirs; GArray *data_dirs;
@ -2810,7 +2810,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
if (retval != NULL) if (retval != NULL)
{ {
G_UNLOCK (g_utils_global); G_UNLOCK (g_utils_global);
return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval; return (const gchar * const *) retval;
} }
} }
} }
@ -2878,7 +2878,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
G_UNLOCK (g_utils_global); G_UNLOCK (g_utils_global);
} }
return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval; return (const gchar * const *) retval;
} }
#endif #endif
@ -2920,7 +2920,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
* not be modified or freed. * not be modified or freed.
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar * G_CONST_RETURN * const gchar * const *
g_get_system_data_dirs (void) g_get_system_data_dirs (void)
{ {
gchar **data_dir_vector; gchar **data_dir_vector;
@ -2947,7 +2947,7 @@ g_get_system_data_dirs (void)
G_UNLOCK (g_utils_global); G_UNLOCK (g_utils_global);
return (G_CONST_RETURN gchar * G_CONST_RETURN *) data_dir_vector; return (const gchar * const *) data_dir_vector;
} }
/** /**
@ -2972,7 +2972,7 @@ g_get_system_data_dirs (void)
* not be modified or freed. * not be modified or freed.
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar * G_CONST_RETURN * const gchar * const *
g_get_system_config_dirs (void) g_get_system_config_dirs (void)
{ {
gchar *conf_dirs, **conf_dir_vector; gchar *conf_dirs, **conf_dir_vector;
@ -3008,7 +3008,7 @@ g_get_system_config_dirs (void)
conf_dir_vector = g_system_config_dirs; conf_dir_vector = g_system_config_dirs;
G_UNLOCK (g_utils_global); G_UNLOCK (g_utils_global);
return (G_CONST_RETURN gchar * G_CONST_RETURN *) conf_dir_vector; return (const gchar * const *) conf_dir_vector;
} }
#ifndef G_OS_WIN32 #ifndef G_OS_WIN32
@ -3333,7 +3333,7 @@ language_names_cache_free (gpointer data)
* *
* Since: 2.6 * Since: 2.6
**/ **/
G_CONST_RETURN gchar * G_CONST_RETURN * const gchar * const *
g_get_language_names (void) g_get_language_names (void)
{ {
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT; static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
@ -3371,7 +3371,7 @@ g_get_language_names (void)
cache->language_names = (gchar **) g_ptr_array_free (array, FALSE); cache->language_names = (gchar **) g_ptr_array_free (array, FALSE);
} }
return (G_CONST_RETURN gchar * G_CONST_RETURN *) cache->language_names; return (const gchar * const *) cache->language_names;
} }
/** /**
@ -3642,7 +3642,7 @@ ensure_gettext_initialized(void)
* *
* Returns: the transation of @str to the current locale * Returns: the transation of @str to the current locale
*/ */
G_CONST_RETURN gchar * const gchar *
glib_gettext (const gchar *str) glib_gettext (const gchar *str)
{ {
ensure_gettext_initialized(); ensure_gettext_initialized();
@ -3665,7 +3665,7 @@ glib_gettext (const gchar *str)
* *
* Returns: the transation of @str to the current locale * Returns: the transation of @str to the current locale
*/ */
G_CONST_RETURN gchar * const gchar *
glib_pgettext(const gchar *msgctxtid, glib_pgettext(const gchar *msgctxtid,
gsize msgidoffset) gsize msgidoffset)
{ {
@ -3709,7 +3709,7 @@ g_get_current_dir (void)
#undef g_getenv #undef g_getenv
G_CONST_RETURN gchar* const gchar *
g_getenv (const gchar *variable) g_getenv (const gchar *variable)
{ {
gchar *utf8_variable = g_locale_to_utf8 (variable, -1, NULL, NULL, NULL); gchar *utf8_variable = g_locale_to_utf8 (variable, -1, NULL, NULL, NULL);
@ -3758,7 +3758,7 @@ g_unsetenv (const gchar *variable)
#undef g_get_user_name #undef g_get_user_name
G_CONST_RETURN gchar* const gchar *
g_get_user_name (void) g_get_user_name (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -3767,7 +3767,7 @@ g_get_user_name (void)
#undef g_get_real_name #undef g_get_real_name
G_CONST_RETURN gchar* const gchar *
g_get_real_name (void) g_get_real_name (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -3776,7 +3776,7 @@ g_get_real_name (void)
#undef g_get_home_dir #undef g_get_home_dir
G_CONST_RETURN gchar* const gchar *
g_get_home_dir (void) g_get_home_dir (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();
@ -3785,7 +3785,7 @@ g_get_home_dir (void)
#undef g_get_tmp_dir #undef g_get_tmp_dir
G_CONST_RETURN gchar* const gchar *
g_get_tmp_dir (void) g_get_tmp_dir (void)
{ {
g_get_any_init_locked (); g_get_any_init_locked ();

38
glib/gutils.h
View File

@ -117,25 +117,25 @@ G_BEGIN_DECLS
#define g_get_tmp_dir g_get_tmp_dir_utf8 #define g_get_tmp_dir g_get_tmp_dir_utf8
#endif #endif
G_CONST_RETURN gchar* g_get_user_name (void); const gchar * g_get_user_name (void);
G_CONST_RETURN gchar* g_get_real_name (void); const gchar * g_get_real_name (void);
G_CONST_RETURN gchar* g_get_home_dir (void); const gchar * g_get_home_dir (void);
G_CONST_RETURN gchar* g_get_tmp_dir (void); const gchar * g_get_tmp_dir (void);
G_CONST_RETURN gchar* g_get_host_name (void); const gchar * g_get_host_name (void);
gchar* g_get_prgname (void); gchar * g_get_prgname (void);
void g_set_prgname (const gchar *prgname); void g_set_prgname (const gchar *prgname);
G_CONST_RETURN gchar* g_get_application_name (void); const gchar * g_get_application_name (void);
void g_set_application_name (const gchar *application_name); void g_set_application_name (const gchar *application_name);
void g_reload_user_special_dirs_cache (void); void g_reload_user_special_dirs_cache (void);
G_CONST_RETURN gchar* g_get_user_data_dir (void); const gchar * g_get_user_data_dir (void);
G_CONST_RETURN gchar* g_get_user_config_dir (void); const gchar * g_get_user_config_dir (void);
G_CONST_RETURN gchar* g_get_user_cache_dir (void); const gchar * g_get_user_cache_dir (void);
G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_data_dirs (void); const gchar * const * g_get_system_data_dirs (void);
#ifdef G_OS_WIN32 #ifdef G_OS_WIN32
/* This functions is not part of the public GLib API */ /* This functions is not part of the public GLib API */
G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void)); const gchar* const * g_win32_get_system_data_dirs_for_module (void (*address_of_function)(void));
#endif #endif
#if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus) #if defined (G_OS_WIN32) && defined (G_CAN_INLINE) && !defined (__cplusplus)
@ -143,7 +143,7 @@ G_CONST_RETURN gchar* G_CONST_RETURN * g_win32_get_system_data_dirs_for_module (
* g_get_system_data_dirs() in your code, never mind that that is * g_get_system_data_dirs() in your code, never mind that that is
* actually a macro and you will in fact call this inline function. * actually a macro and you will in fact call this inline function.
*/ */
static inline G_CONST_RETURN gchar * G_CONST_RETURN * static inline const gchar * const *
_g_win32_get_system_data_dirs (void) _g_win32_get_system_data_dirs (void)
{ {
return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs); return g_win32_get_system_data_dirs_for_module ((void (*)(void)) &_g_win32_get_system_data_dirs);
@ -151,11 +151,11 @@ _g_win32_get_system_data_dirs (void)
#define g_get_system_data_dirs _g_win32_get_system_data_dirs #define g_get_system_data_dirs _g_win32_get_system_data_dirs
#endif #endif
G_CONST_RETURN gchar* G_CONST_RETURN * g_get_system_config_dirs (void); const gchar * const * g_get_system_config_dirs (void);
const gchar * g_get_user_runtime_dir (void); const gchar * g_get_user_runtime_dir (void);
G_CONST_RETURN gchar* G_CONST_RETURN * g_get_language_names (void); const gchar * const * g_get_language_names (void);
gchar **g_get_locale_variants (const gchar *locale); gchar **g_get_locale_variants (const gchar *locale);
@ -194,7 +194,7 @@ typedef enum {
G_USER_N_DIRECTORIES G_USER_N_DIRECTORIES
} GUserDirectory; } GUserDirectory;
G_CONST_RETURN gchar* g_get_user_special_dir (GUserDirectory directory); const gchar * g_get_user_special_dir (GUserDirectory directory);
typedef struct _GDebugKey GDebugKey; typedef struct _GDebugKey GDebugKey;
struct _GDebugKey struct _GDebugKey
@ -222,7 +222,7 @@ gint g_vsnprintf (gchar *string,
gboolean g_path_is_absolute (const gchar *file_name); gboolean g_path_is_absolute (const gchar *file_name);
/* In case of absolute paths, skip the root part */ /* In case of absolute paths, skip the root part */
G_CONST_RETURN gchar* g_path_skip_root (const gchar *file_name); const gchar * g_path_skip_root (const gchar *file_name);
#ifndef G_DISABLE_DEPRECATED #ifndef G_DISABLE_DEPRECATED
@ -230,7 +230,7 @@ G_CONST_RETURN gchar* g_path_skip_root (const gchar *file_name);
* major release of GLib. Use g_path_get_dirname/g_path_get_basename * major release of GLib. Use g_path_get_dirname/g_path_get_basename
* instead. Whatch out! The string returned by g_path_get_basename * instead. Whatch out! The string returned by g_path_get_basename
* must be g_freed, while the string returned by g_basename must not.*/ * must be g_freed, while the string returned by g_basename must not.*/
G_CONST_RETURN gchar* g_basename (const gchar *file_name); const gchar * g_basename (const gchar *file_name);
#define g_dirname g_path_get_dirname #define g_dirname g_path_get_dirname
#endif /* G_DISABLE_DEPRECATED */ #endif /* G_DISABLE_DEPRECATED */
@ -256,7 +256,7 @@ void g_nullify_pointer (gpointer *nullify_location);
#define g_find_program_in_path g_find_program_in_path_utf8 #define g_find_program_in_path g_find_program_in_path_utf8
#endif #endif
G_CONST_RETURN gchar* g_getenv (const gchar *variable); const gchar * g_getenv (const gchar *variable);
gboolean g_setenv (const gchar *variable, gboolean g_setenv (const gchar *variable,
const gchar *value, const gchar *value,
gboolean overwrite); gboolean overwrite);

6
gmodule/gmodule.c
View File

@ -598,7 +598,7 @@ g_module_make_resident (GModule *module)
module->is_resident = TRUE; module->is_resident = TRUE;
} }
G_CONST_RETURN gchar* const gchar *
g_module_error (void) g_module_error (void)
{ {
return g_static_private_get (&module_error_private); return g_static_private_get (&module_error_private);
@ -648,7 +648,7 @@ g_module_symbol (GModule *module,
return !module_error; return !module_error;
} }
G_CONST_RETURN gchar* const gchar *
g_module_name (GModule *module) g_module_name (GModule *module)
{ {
g_return_val_if_fail (module != NULL, NULL); g_return_val_if_fail (module != NULL, NULL);
@ -663,7 +663,7 @@ g_module_name (GModule *module)
#undef g_module_name #undef g_module_name
G_CONST_RETURN gchar* const gchar *
g_module_name (GModule *module) g_module_name (GModule *module)
{ {
g_return_val_if_fail (module != NULL, NULL); g_return_val_if_fail (module != NULL, NULL);

4
gmodule/gmodule.h
View File

@ -71,7 +71,7 @@ gboolean g_module_close (GModule *module);
void g_module_make_resident (GModule *module); void g_module_make_resident (GModule *module);
/* query the last module error as a string */ /* query the last module error as a string */
G_CONST_RETURN gchar* g_module_error (void); const gchar * g_module_error (void);
/* retrieve a symbol pointer from `module', returns TRUE on success */ /* retrieve a symbol pointer from `module', returns TRUE on success */
gboolean g_module_symbol (GModule *module, gboolean g_module_symbol (GModule *module,
@ -79,7 +79,7 @@ gboolean g_module_symbol (GModule *module,
gpointer *symbol); gpointer *symbol);
/* retrieve the file name from an existing module */ /* retrieve the file name from an existing module */
G_CONST_RETURN gchar* g_module_name (GModule *module); const gchar * g_module_name (GModule *module);
/* Build the actual file name containing a module. `directory' is the /* Build the actual file name containing a module. `directory' is the
* directory where the module file is supposed to be, or NULL or empty * directory where the module file is supposed to be, or NULL or empty

4
gobject/gbinding.c
View File

@ -742,7 +742,7 @@ g_binding_get_target (GBinding *binding)
* *
* Since: 2.26 * Since: 2.26
*/ */
G_CONST_RETURN gchar * const gchar *
g_binding_get_source_property (GBinding *binding) g_binding_get_source_property (GBinding *binding)
{ {
g_return_val_if_fail (G_IS_BINDING (binding), NULL); g_return_val_if_fail (G_IS_BINDING (binding), NULL);
@ -761,7 +761,7 @@ g_binding_get_source_property (GBinding *binding)
* *
* Since: 2.26 * Since: 2.26
*/ */
G_CONST_RETURN gchar * const gchar *
g_binding_get_target_property (GBinding *binding) g_binding_get_target_property (GBinding *binding)
{ {
g_return_val_if_fail (G_IS_BINDING (binding), NULL); g_return_val_if_fail (G_IS_BINDING (binding), NULL);

4
gobject/gbinding.h
View File

@ -106,8 +106,8 @@ GType g_binding_get_type (void) G_GNUC_CONST;
GBindingFlags g_binding_get_flags (GBinding *binding); GBindingFlags g_binding_get_flags (GBinding *binding);
GObject * g_binding_get_source (GBinding *binding); GObject * g_binding_get_source (GBinding *binding);
GObject * g_binding_get_target (GBinding *binding); GObject * g_binding_get_target (GBinding *binding);
G_CONST_RETURN gchar *g_binding_get_source_property (GBinding *binding); const gchar * g_binding_get_source_property (GBinding *binding);
G_CONST_RETURN gchar *g_binding_get_target_property (GBinding *binding); const gchar * g_binding_get_target_property (GBinding *binding);
GBinding *g_object_bind_property (gpointer source, GBinding *g_object_bind_property (gpointer source,
const gchar *source_property, const gchar *source_property,

6
gobject/gparam.c
View File

@ -282,7 +282,7 @@ g_param_spec_ref_sink (GParamSpec *pspec)
* *
* Returns: the name of @pspec. * Returns: the name of @pspec.
*/ */
G_CONST_RETURN gchar* const gchar *
g_param_spec_get_name (GParamSpec *pspec) g_param_spec_get_name (GParamSpec *pspec)
{ {
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL); g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@ -298,7 +298,7 @@ g_param_spec_get_name (GParamSpec *pspec)
* *
* Returns: the nickname of @pspec. * Returns: the nickname of @pspec.
*/ */
G_CONST_RETURN gchar* const gchar *
g_param_spec_get_nick (GParamSpec *pspec) g_param_spec_get_nick (GParamSpec *pspec)
{ {
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL); g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);
@ -325,7 +325,7 @@ g_param_spec_get_nick (GParamSpec *pspec)
* *
* Returns: the short description of @pspec. * Returns: the short description of @pspec.
*/ */
G_CONST_RETURN gchar* const gchar *
g_param_spec_get_blurb (GParamSpec *pspec) g_param_spec_get_blurb (GParamSpec *pspec)
{ {
g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL); g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), NULL);

6
gobject/gparam.h
View File

@ -301,9 +301,9 @@ gboolean g_param_value_convert (GParamSpec *pspec,
gint g_param_values_cmp (GParamSpec *pspec, gint g_param_values_cmp (GParamSpec *pspec,
const GValue *value1, const GValue *value1,
const GValue *value2); const GValue *value2);
G_CONST_RETURN gchar* g_param_spec_get_name (GParamSpec *pspec); const gchar * g_param_spec_get_name (GParamSpec *pspec);
G_CONST_RETURN gchar* g_param_spec_get_nick (GParamSpec *pspec); const gchar * g_param_spec_get_nick (GParamSpec *pspec);
G_CONST_RETURN gchar* g_param_spec_get_blurb (GParamSpec *pspec); const gchar * g_param_spec_get_blurb (GParamSpec *pspec);
void g_value_set_param (GValue *value, void g_value_set_param (GValue *value,
GParamSpec *param); GParamSpec *param);
GParamSpec* g_value_get_param (const GValue *value); GParamSpec* g_value_get_param (const GValue *value);

2
gobject/gsignal.c
View File

@ -1223,7 +1223,7 @@ g_signal_list_ids (GType itype,
* *
* Returns: the signal name, or %NULL if the signal number was invalid. * Returns: the signal name, or %NULL if the signal number was invalid.
*/ */
G_CONST_RETURN gchar* const gchar *
g_signal_name (guint signal_id) g_signal_name (guint signal_id)
{ {
SignalNode *node; SignalNode *node;

2
gobject/gsignal.h
View File

@ -308,7 +308,7 @@ void g_signal_emit_by_name (gpointer instance,
...); ...);
guint g_signal_lookup (const gchar *name, guint g_signal_lookup (const gchar *name,
GType itype); GType itype);
G_CONST_RETURN gchar* g_signal_name (guint signal_id); const gchar * g_signal_name (guint signal_id);
void g_signal_query (guint signal_id, void g_signal_query (guint signal_id,
GSignalQuery *query); GSignalQuery *query);
guint* g_signal_list_ids (GType itype, guint* g_signal_list_ids (GType itype,

6
gobject/gtype.c
View File

@ -3279,7 +3279,7 @@ g_type_default_interface_unref (gpointer g_iface)
* *
* Returns: Static type name or %NULL. * Returns: Static type name or %NULL.
*/ */
G_CONST_RETURN gchar* const gchar *
g_type_name (GType type) g_type_name (GType type)
{ {
TypeNode *node; TypeNode *node;
@ -4206,7 +4206,7 @@ g_type_value_table_peek (GType type)
return NULL; return NULL;
} }
G_CONST_RETURN gchar* const gchar *
g_type_name_from_instance (GTypeInstance *instance) g_type_name_from_instance (GTypeInstance *instance)
{ {
if (!instance) if (!instance)
@ -4215,7 +4215,7 @@ g_type_name_from_instance (GTypeInstance *instance)
return g_type_name_from_class (instance->g_class); return g_type_name_from_class (instance->g_class);
} }
G_CONST_RETURN gchar* const gchar *
g_type_name_from_class (GTypeClass *g_class) g_type_name_from_class (GTypeClass *g_class)
{ {
if (!g_class) if (!g_class)

6
gobject/gtype.h
View File

@ -666,7 +666,7 @@ typedef enum /*< skip >*/
/* --- prototypes --- */ /* --- prototypes --- */
void g_type_init (void); void g_type_init (void);
void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags); void g_type_init_with_debug_flags (GTypeDebugFlags debug_flags);
G_CONST_RETURN gchar* g_type_name (GType type); const gchar * g_type_name (GType type);
GQuark g_type_qname (GType type); GQuark g_type_qname (GType type);
GType g_type_from_name (const gchar *name); GType g_type_from_name (const gchar *name);
GType g_type_parent (GType type); GType g_type_parent (GType type);
@ -1657,8 +1657,8 @@ gboolean g_type_test_flags (GType type,
/* --- debugging functions --- */ /* --- debugging functions --- */
G_CONST_RETURN gchar* g_type_name_from_instance (GTypeInstance *instance); const gchar * g_type_name_from_instance (GTypeInstance *instance);
G_CONST_RETURN gchar* g_type_name_from_class (GTypeClass *g_class); const gchar * g_type_name_from_class (GTypeClass *g_class);
/* --- internal functions --- */ /* --- internal functions --- */

2
gobject/gvaluetypes.c
View File

@ -1073,7 +1073,7 @@ g_value_take_string (GValue *value,
* *
* Returns: string content of @value * Returns: string content of @value
*/ */
G_CONST_RETURN gchar* const gchar *
g_value_get_string (const GValue *value) g_value_get_string (const GValue *value)
{ {
g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL); g_return_val_if_fail (G_VALUE_HOLDS_STRING (value), NULL);

2
gobject/gvaluetypes.h
View File

@ -214,7 +214,7 @@ void g_value_set_string (GValue *value,
const gchar *v_string); const gchar *v_string);
void g_value_set_static_string (GValue *value, void g_value_set_static_string (GValue *value,
const gchar *v_string); const gchar *v_string);
G_CONST_RETURN gchar* g_value_get_string (const GValue *value); const gchar * g_value_get_string (const GValue *value);
gchar* g_value_dup_string (const GValue *value); gchar* g_value_dup_string (const GValue *value);
void g_value_set_pointer (GValue *value, void g_value_set_pointer (GValue *value,
gpointer v_pointer); gpointer v_pointer);