Skip to content

GitLab

Commit 8073759f authored by Allison Karlitskaya's avatar Allison Karlitskaya
Browse files
Options

Remove all uses of G_CONST_RETURN 

Just use 'const'.

https://bugzilla.gnome.org/show_bug.cgi?id=644611
parent 8f21e814
Hide whitespace changes
Inline Side-by-side
Showing with 122 additions and 122 deletions
glib/gchecksum.c
View file @ 8073759f
......@@ -1289,7 +1289,7 @@ g_checksum_update (GChecksum *checksum,
*
* Since: 2.16
*/
G_CONST_RETURN gchar *
const gchar *
g_checksum_get_string (GChecksum *checksum)
{
gchar *str = NULL;
......
glib/gchecksum.h
View file @ 8073759f
......@@ -69,7 +69,7 @@ void g_checksum_free (GChecksum *checksum);
void g_checksum_update (GChecksum *checksum,
const guchar *data,
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,
guint8 *buffer,
gsize *digest_len);
......
glib/gconvert.c
View file @ 8073759f
......@@ -1318,7 +1318,7 @@ filename_charset_cache_free (gpointer data)
* Since: 2.6
*/
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;
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 */
gboolean
g_get_filename_charsets (G_CONST_RETURN gchar ***filename_charsets)
g_get_filename_charsets (const gchar ***filename_charsets)
{
static const gchar *charsets[] = {
"UTF-8",
......
glib/gconvert.h
View file @ 8073759f
......@@ -153,7 +153,7 @@ gchar *g_filename_to_uri (const gchar *filename,
const gchar *hostname,
GError **error) 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;
......
glib/gdataset.c
View file @ 8073759f
......@@ -1246,7 +1246,7 @@ g_quark_from_static_string (const gchar *string)
*
* Gets the string associated with the given #GQuark.
**/
G_CONST_RETURN gchar*
const gchar *
g_quark_to_string (GQuark quark)
{
gchar* result = NULL;
......@@ -1307,7 +1307,7 @@ g_quark_new (gchar *string)
*
* Since: 2.10
*/
G_CONST_RETURN gchar*
const gchar *
g_intern_string (const gchar *string)
{
const gchar *result;
......@@ -1337,7 +1337,7 @@ g_intern_string (const gchar *string)
*
* Since: 2.10
*/
G_CONST_RETURN gchar*
const gchar *
g_intern_static_string (const gchar *string)
{
GQuark quark;
......
glib/gdir.c
View file @ 8073759f
......@@ -194,7 +194,7 @@ g_dir_open (const gchar *path,
* more entries. The return value is owned by GLib and
* must not be modified or freed.
**/
G_CONST_RETURN gchar*
const gchar *
g_dir_read_name (GDir *dir)
{
#ifdef G_OS_WIN32
......@@ -250,7 +250,7 @@ g_dir_read_name (GDir *dir)
/* Binary compatibility version. Not for newly compiled code. */
G_CONST_RETURN gchar*
const gchar *
g_dir_read_name (GDir *dir)
{
while (1)
......
glib/gdir.h
View file @ 8073759f
......@@ -45,7 +45,7 @@ typedef struct _GDir GDir;
GDir * g_dir_open (const gchar *path,
guint flags,
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_close (GDir *dir);
......
glib/giochannel.c
View file @ 8073759f
......@@ -921,7 +921,7 @@ g_io_channel_set_line_term (GIOChannel *channel,
* Return value: The line termination string. This value
* is owned by GLib and must not be freed.
**/
G_CONST_RETURN gchar*
const gchar *
g_io_channel_get_line_term (GIOChannel *channel,
gint *length)
{
......@@ -1459,7 +1459,7 @@ g_io_channel_set_encoding (GIOChannel *channel,
* Return value: A string containing the encoding, this string is
* owned by GLib and must not be freed.
**/
G_CONST_RETURN gchar*
const gchar *
g_io_channel_get_encoding (GIOChannel *channel)
{
g_return_val_if_fail (channel != NULL, NULL);
......
glib/giochannel.h
View file @ 8073759f
......@@ -215,7 +215,7 @@ GIOFlags g_io_channel_get_flags (GIOChannel *channel);
void g_io_channel_set_line_term (GIOChannel *channel,
const gchar *line_term,
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);
void g_io_channel_set_buffered (GIOChannel *channel,
gboolean buffered);
......@@ -223,7 +223,7 @@ gboolean g_io_channel_get_buffered (GIOChannel *channel);
GIOStatus g_io_channel_set_encoding (GIOChannel *channel,
const gchar *encoding,
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,
gboolean do_close);
gboolean g_io_channel_get_close_on_unref (GIOChannel *channel);
......
glib/glibintl.h
View file @ 8073759f
......@@ -5,9 +5,9 @@
#error "config.h must be included prior to glibintl.h"
#endif
G_CONST_RETURN gchar *glib_gettext (const gchar *str) G_GNUC_FORMAT(1);
G_CONST_RETURN gchar *glib_pgettext (const gchar *msgctxtid,
gsize msgidoffset) G_GNUC_FORMAT(1);
const gchar * glib_gettext (const gchar *str) G_GNUC_FORMAT(1);
const gchar * glib_pgettext (const gchar *msgctxtid,
gsize msgidoffset) G_GNUC_FORMAT(1);
#ifdef ENABLE_NLS
......
glib/gmain.c
View file @ 8073759f
......@@ -1621,7 +1621,7 @@ g_source_set_name (GSource *source,
* Return value: the name of the source
* Since: 2.26
**/
G_CONST_RETURN char*
const char *
g_source_get_name (GSource *source)
{
g_return_val_if_fail (source != NULL, NULL);
......
glib/gmain.h
View file @ 8073759f
......@@ -366,7 +366,7 @@ gboolean g_source_is_destroyed (GSource *source);
void g_source_set_name (GSource *source,
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,
const char *name);
......
glib/gmarkup.c
View file @ 8073759f
......@@ -1820,7 +1820,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context,
*
* Since: 2.2
*/
G_CONST_RETURN gchar *
const gchar *
g_markup_parse_context_get_element (GMarkupParseContext *context)
{
g_return_val_if_fail (context != NULL, NULL);
......@@ -1851,7 +1851,7 @@ g_markup_parse_context_get_element (GMarkupParseContext *context)
*
* Since: 2.16
*/
G_CONST_RETURN GSList *
const GSList *
g_markup_parse_context_get_element_stack (GMarkupParseContext *context)
{
g_return_val_if_fail (context != NULL, NULL);
......
glib/gmarkup.h
View file @ 8073759f
......@@ -194,8 +194,8 @@ gpointer g_markup_parse_context_pop (GMarkupParseContext *context)
gboolean g_markup_parse_context_end_parse (GMarkupParseContext *context,
GError **error);
G_CONST_RETURN gchar *g_markup_parse_context_get_element (GMarkupParseContext *context);
G_CONST_RETURN GSList *g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
const gchar * g_markup_parse_context_get_element (GMarkupParseContext *context);
const GSList * g_markup_parse_context_get_element_stack (GMarkupParseContext *context);
/* For user-constructed error messages, has no precise semantics */
void g_markup_parse_context_get_position (GMarkupParseContext *context,
......
glib/goption.c
View file @ 8073759f
......@@ -2382,7 +2382,7 @@ g_option_context_set_summary (GOptionContext *context,
*
* Since: 2.12
*/
G_CONST_RETURN gchar *
const gchar *
g_option_context_get_summary (GOptionContext *context)
{
g_return_val_if_fail (context != NULL, NULL);
......@@ -2426,7 +2426,7 @@ g_option_context_set_description (GOptionContext *context,
*
* Since: 2.12
*/
G_CONST_RETURN gchar *
const gchar *
g_option_context_get_description (GOptionContext *context)
{
g_return_val_if_fail (context != NULL, NULL);
......
glib/goption.h
View file @ 8073759f
......@@ -310,10 +310,10 @@ struct _GOptionEntry
GOptionContext *g_option_context_new (const gchar *parameter_string);
void g_option_context_set_summary (GOptionContext *context,
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,
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_set_help_enabled (GOptionContext *context,
gboolean help_enabled);
......
glib/gquark.h
View file @ 8073759f
......@@ -42,10 +42,10 @@ typedef guint32 GQuark;
GQuark g_quark_try_string (const gchar *string);
GQuark g_quark_from_static_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);
G_CONST_RETURN gchar* g_intern_static_string (const gchar *string);
const gchar * g_intern_string (const gchar *string);
const gchar * g_intern_static_string (const gchar *string);
G_END_DECLS
......
glib/gstrfuncs.c
View file @ 8073759f
......@@ -931,7 +931,7 @@ g_ascii_strtoll (const gchar *nptr,
* is unknown, it returns "unknown error (<code>)". The string
* can only be used until the next call to g_strerror()
*/
G_CONST_RETURN gchar*
const gchar *
g_strerror (gint errnum)
{
static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
......@@ -1412,7 +1412,7 @@ g_strerror (gint errnum)
* it returns "unknown signal (<signum>)". The string can only be
* used until the next call to g_strsignal()
*/
G_CONST_RETURN gchar*
const gchar *
g_strsignal (gint signum)
{
static GStaticPrivate msg_private = G_STATIC_PRIVATE_INIT;
......@@ -2966,7 +2966,7 @@ g_str_has_prefix (const gchar *str,
*
* Since: 2.4
**/
G_CONST_RETURN gchar *
const gchar *
g_strip_context (const gchar *msgid,
const gchar *msgval)
{
......@@ -3032,7 +3032,7 @@ g_strv_length (gchar **str_array)
*
* Since: 2.16
*/
G_CONST_RETURN gchar *
const gchar *
g_dpgettext (const gchar *domain,
const gchar *msgctxtid,
gsize msgidoffset)
......@@ -3093,7 +3093,7 @@ g_dpgettext (const gchar *domain,
*
* Since: 2.18
*/
G_CONST_RETURN char *
const char *
g_dpgettext2 (const char *domain,
const char *msgctxt,
const char *msgid)
......@@ -3214,7 +3214,7 @@ _g_dgettext_should_translate (void)
*
* Since: 2.18
*/
G_CONST_RETURN gchar *
const gchar *
g_dgettext (const gchar *domain,
const gchar *msgid)
{
......@@ -3240,7 +3240,7 @@ g_dgettext (const gchar *domain,
*
* Since: 2.26
*/
G_CONST_RETURN gchar *
const gchar *
g_dcgettext (const gchar *domain,
const gchar *msgid,
int category)
......@@ -3270,7 +3270,7 @@ g_dcgettext (const gchar *domain,
*
* Since: 2.18
*/
G_CONST_RETURN gchar *
const gchar *
g_dngettext (const gchar *domain,
const gchar *msgid,
const gchar *msgid_plural,
......
glib/gstrfuncs.h
View file @ 8073759f
......@@ -103,9 +103,9 @@ gchar* g_strdelimit (gchar *string,
gchar* g_strcanon (gchar *string,
const gchar *valid_chars,
gchar substitutor);
G_CONST_RETURN gchar* g_strerror (gint errnum) G_GNUC_CONST;
G_CONST_RETURN gchar* g_strsignal (gint signum) G_GNUC_CONST;
gchar* g_strreverse (gchar *string);
const gchar * g_strerror (gint errnum) G_GNUC_CONST;
const gchar * g_strsignal (gint signum) G_GNUC_CONST;
gchar * g_strreverse (gchar *string);
gsize g_strlcpy (gchar *dest,
const gchar *src,
gsize dest_size);
......@@ -245,22 +245,22 @@ guint g_strv_length (gchar **str_array);
gchar* g_stpcpy (gchar *dest,
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);
G_CONST_RETURN gchar *g_dgettext (const gchar *domain,
const gchar * g_dgettext (const gchar *domain,
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,
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_plural,
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,
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 *msgid) G_GNUC_FORMAT(3);
......
glib/gunicode.h
View file @ 8073759f
......@@ -236,7 +236,7 @@ typedef enum
* in case the locale's charset will be changed later using setlocale()
* 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.
*/
......
glib/gutf8.c
View file @ 8073759f
......@@ -553,7 +553,7 @@ charset_cache_free (gpointer data)
* Return value: %TRUE if the returned charset is UTF-8
**/
gboolean
g_get_charset (G_CONST_RETURN char **charset)
g_get_charset (const char **charset)
{
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
GCharsetCache *cache = g_static_private_get (&cache_private);
......
glib/gutils.c
View file @ 8073759f
......@@ -720,7 +720,7 @@ g_parse_debug_string (const gchar *string,
* g_path_get_basename() allocates new memory for the returned string, unlike
* this function which returns a pointer into the argument.
**/
G_CONST_RETURN gchar*
const gchar *
g_basename (const gchar *file_name)
{
register gchar *base;
......@@ -866,7 +866,7 @@ g_path_is_absolute (const gchar *file_name)
*
* 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_return_val_if_fail (file_name != NULL, NULL);
......@@ -1167,7 +1167,7 @@ g_get_current_dir (void)
* overwritten by the next call to g_getenv(), g_setenv() or
* g_unsetenv().
**/
G_CONST_RETURN gchar*
const gchar *
g_getenv (const gchar *variable)
{
#ifndef G_OS_WIN32
......@@ -1931,7 +1931,7 @@ g_get_any_init_locked (void)
*
* Returns: the user name of the current user.
*/
G_CONST_RETURN gchar*
const gchar *
g_get_user_name (void)
{
g_get_any_init_locked ();
......@@ -1949,7 +1949,7 @@ g_get_user_name (void)
*
* Returns: the user's real name.
*/
G_CONST_RETURN gchar*
const gchar *
g_get_real_name (void)
{
g_get_any_init_locked ();
......@@ -1987,7 +1987,7 @@ g_get_real_name (void)
*
* Returns: the current user's home directory
*/
G_CONST_RETURN gchar*
const gchar *
g_get_home_dir (void)
{
g_get_any_init_locked ();
......@@ -2006,7 +2006,7 @@ g_get_home_dir (void)
*
* Returns: the directory to use for temporary files.
*/
G_CONST_RETURN gchar*
const gchar *
g_get_tmp_dir (void)
{
g_get_any_init_locked ();
......@@ -2125,7 +2125,7 @@ static gchar *g_application_name = NULL;
*
* Since: 2.2
**/
G_CONST_RETURN gchar*
const gchar *
g_get_application_name (void)
{
gchar* retval;
......@@ -2194,7 +2194,7 @@ g_set_application_name (const gchar *application_name)
* or freed.
* Since: 2.6
**/
G_CONST_RETURN gchar*
const gchar *
g_get_user_data_dir (void)
{
gchar *data_dir;
......@@ -2282,7 +2282,7 @@ g_init_user_config_dir (void)
* or freed.
* Since: 2.6
**/
G_CONST_RETURN gchar*
const gchar *
g_get_user_config_dir (void)
{
G_LOCK (g_utils_global);
......@@ -2314,7 +2314,7 @@ g_get_user_config_dir (void)
* or freed.
* Since: 2.6
**/
G_CONST_RETURN gchar*
const gchar *
g_get_user_cache_dir (void)
{
gchar *cache_dir;
......@@ -2755,7 +2755,7 @@ g_reload_user_special_dirs_cache (void)
*
* Since: 2.14
*/
G_CONST_RETURN gchar *
const gchar *
g_get_user_special_dir (GUserDirectory directory)
{
g_return_val_if_fail (directory >= G_USER_DIRECTORY_DESKTOP &&
......@@ -2840,7 +2840,7 @@ get_module_share_dir (gconstpointer address)
return retval;
}
G_CONST_RETURN gchar * G_CONST_RETURN *
const gchar * const *
g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
{
GArray *data_dirs;
......@@ -2865,7 +2865,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
if (retval != NULL)
{
G_UNLOCK (g_utils_global);
return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval;
return (const gchar * const *) retval;
}
}
}
......@@ -2933,7 +2933,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
G_UNLOCK (g_utils_global);
}
return (G_CONST_RETURN gchar * G_CONST_RETURN *) retval;
return (const gchar * const *) retval;
}
#endif
......@@ -2975,7 +2975,7 @@ g_win32_get_system_data_dirs_for_module (void (*address_of_function)())
* not be modified or freed.
* Since: 2.6
**/
G_CONST_RETURN gchar * G_CONST_RETURN *
const gchar * const *
g_get_system_data_dirs (void)
{
gchar **data_dir_vector;
......@@ -3002,7 +3002,7 @@ g_get_system_data_dirs (void)
G_UNLOCK (g_utils_global);
return (G_CONST_RETURN gchar * G_CONST_RETURN *) data_dir_vector;
return (const gchar * const *) data_dir_vector;
}
/**
......@@ -3027,7 +3027,7 @@ g_get_system_data_dirs (void)
* not be modified or freed.
* Since: 2.6
**/
G_CONST_RETURN gchar * G_CONST_RETURN *
const gchar * const *
g_get_system_config_dirs (void)
{
gchar *conf_dirs, **conf_dir_vector;
......@@ -3063,7 +3063,7 @@ g_get_system_config_dirs (void)
conf_dir_vector = g_system_config_dirs;
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
......@@ -3388,7 +3388,7 @@ language_names_cache_free (gpointer data)
*
* Since: 2.6
**/
G_CONST_RETURN gchar * G_CONST_RETURN *
const gchar * const *
g_get_language_names (void)
{
static GStaticPrivate cache_private = G_STATIC_PRIVATE_INIT;
......@@ -3426,7 +3426,7 @@ g_get_language_names (void)
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;
}
/**
......@@ -3697,7 +3697,7 @@ ensure_gettext_initialized(void)
*
* Returns: the transation of @str to the current locale
*/
G_CONST_RETURN gchar *
const gchar *
glib_gettext (const gchar *str)
{
ensure_gettext_initialized();
......@@ -3720,7 +3720,7 @@ glib_gettext (const gchar *str)
*
* Returns: the transation of @str to the current locale
*/
G_CONST_RETURN gchar *
const gchar *
glib_pgettext(const gchar *msgctxtid,
gsize msgidoffset)
{
......@@ -3764,7 +3764,7 @@ g_get_current_dir (void)
#undef g_getenv
G_CONST_RETURN gchar*
const gchar *
g_getenv (const gchar *variable)
{
gchar *utf8_variable = g_locale_to_utf8 (variable, -1, NULL, NULL, NULL);
......@@ -3813,7 +3813,7 @@ g_unsetenv (const gchar *variable)
#undef g_get_user_name
G_CONST_RETURN gchar*
const gchar *
g_get_user_name (void)
{
g_get_any_init_locked ();
......@@ -3822,7 +3822,7 @@ g_get_user_name (void)
#undef g_get_real_name
G_CONST_RETURN gchar*
const gchar *
g_get_real_name (void)
{
g_get_any_init_locked ();
......@@ -3831,7 +3831,7 @@ g_get_real_name (void)
#undef g_get_home_dir
G_CONST_RETURN gchar*
const gchar *
g_get_home_dir (void)
{
g_get_any_init_locked ();
......@@ -3840,7 +3840,7 @@ g_get_home_dir (void)
#undef g_get_tmp_dir
G_CONST_RETURN gchar*
const gchar *
g_get_tmp_dir (void)
{
g_get_any_init_locked ();
......
glib/gutils.h
View file @ 8073759f
......@@ -117,25 +117,25 @@ G_BEGIN_DECLS
#endif
#endif