Merge branch 'concurrent-cancellable'

[platform/upstream/glib.git] / glib / gstrfuncs.c

diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index 04f686b..c695c9f 100644 (file)
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -30,8 +30,6 @@
 
 #include "config.h"
 
-#define _GNU_SOURCE             /* For stpcpy */
-
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -261,7 +259,7 @@ g_strdup_vprintf (const gchar *format,
  * g_strdup_printf:
  * @format: a standard printf() format string, but notice
  *     <link linkend="string-precision">string precision pitfalls</link>
- * @Varargs: the parameters to insert into the format string
+ * @...: the parameters to insert into the format string
  *
  * Similar to the standard C sprintf() function but safer, since it
  * calculates the maximum space required and allocates memory to hold
@@ -287,7 +285,7 @@ g_strdup_printf (const gchar *format,
 /**
  * g_strconcat:
  * @string1: the first string to add, which must not be %NULL
- * @Varargs: a %NULL-terminated list of strings to append to the string
+ * @...: a %NULL-terminated list of strings to append to the string
  *
  * Concatenates all of the given strings into one long string.
  * The returned string should be freed with g_free() when no longer needed.
@@ -933,7 +931,7 @@ g_ascii_strtoll (const gchar *nptr,
  *     is unknown, it returns "unknown error (&lt;code&gt;)". 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;
@@ -1414,7 +1412,7 @@ g_strerror (gint errnum)
  *     it returns "unknown signal (&lt;signum&gt;)". 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;
@@ -2668,7 +2666,7 @@ g_strjoinv (const gchar  *separator,
 /**
  * g_strjoin:
  * @separator: a string to insert between each of the strings, or %NULL
- * @Varargs: a %NULL-terminated list of strings to join
+ * @...: a %NULL-terminated list of strings to join
  *
  * Joins a number of strings together to form one long string, with the
  * optional @separator inserted between each of them. The returned string
@@ -2968,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)
 {
@@ -3034,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)
@@ -3095,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)
@@ -3216,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)
 {
@@ -3242,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)
@@ -3272,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,