Commit 36741245 authored by Allison Karlitskaya's avatar Allison Karlitskaya
Browse files

Remove all uses of G_CONST_RETURN

Just use 'const'.
parent 61b0e1c8
...@@ -1289,7 +1289,7 @@ g_checksum_update (GChecksum *checksum, ...@@ -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;
......
...@@ -69,7 +69,7 @@ void g_checksum_free (GChecksum *checksum); ...@@ -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);
......
...@@ -1318,7 +1318,7 @@ filename_charset_cache_free (gpointer data) ...@@ -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) ...@@ -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",
......
...@@ -151,7 +151,7 @@ gchar *g_filename_to_uri (const gchar *filename, ...@@ -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;
......
...@@ -1129,7 +1129,7 @@ g_quark_from_static_string (const gchar *string) ...@@ -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) ...@@ -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) ...@@ -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;
......
...@@ -194,7 +194,7 @@ g_dir_open (const gchar *path, ...@@ -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) ...@@ -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)
......
...@@ -43,7 +43,7 @@ typedef struct _GDir GDir; ...@@ -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);
......
...@@ -920,7 +920,7 @@ g_io_channel_set_line_term (GIOChannel *channel, ...@@ -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, ...@@ -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);
......
...@@ -215,7 +215,7 @@ GIOFlags g_io_channel_get_flags (GIOChannel *channel); ...@@ -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); ...@@ -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);
......
...@@ -5,9 +5,9 @@ ...@@ -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
......
...@@ -1591,7 +1591,7 @@ g_source_set_name (GSource *source, ...@@ -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);
......
...@@ -350,7 +350,7 @@ gboolean g_source_is_destroyed (GSource *source); ...@@ -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);
......
...@@ -1819,7 +1819,7 @@ g_markup_parse_context_end_parse (GMarkupParseContext *context, ...@@ -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) ...@@ -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);
......
...@@ -194,8 +194,8 @@ gpointer g_markup_parse_context_pop (GMarkupParseContext *context) ...@@ -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,
......
...@@ -2346,7 +2346,7 @@ g_option_context_set_summary (GOptionContext *context, ...@@ -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, ...@@ -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);
......
...@@ -310,10 +310,10 @@ struct _GOptionEntry ...@@ -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);
......
...@@ -42,10 +42,10 @@ typedef guint32 GQuark; ...@@ -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
......
...@@ -933,7 +933,7 @@ g_ascii_strtoll (const gchar *nptr, ...@@ -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) ...@@ -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, ...@@ -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) ...@@ -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, ...@@ -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) ...@@ -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, ...@@ -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, ...@@ -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,
......
...@@ -103,9 +103,9 @@ gchar* g_strdelimit (gchar *string, ...@@ -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); ...@@ -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);
......
...@@ -236,7 +236,7 @@ typedef enum ...@@ -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.
*/ */
......
...@@ -553,7 +553,7 @@ charset_cache_free (gpointer data) ...@@ -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);
......
...@@ -711,7 +711,7 @@ g_parse_debug_string (const gchar *string, ...@@ -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) ...@@ -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) ...@@ -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) ...@@ -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.