[glib/glib-2-56: 2/4] glib: Drop G_GNUC_MALLOC usage from various allocation functions

commit 41f23a2c44e22276f66a6ced53151eb15f319047
Author: Philip Withnall <withnall endlessm com>
Date:   Wed Aug 22 11:09:01 2018 +0100

    glib: Drop G_GNUC_MALLOC usage from various allocation functions
    These are our most critically incorrect uses of G_GNUC_MALLOC. See the
    previous commit for details.
    (Backport to 2.56: Drop the grcbox.h changes.)
    Signed-off-by: Philip Withnall <withnall endlessm com>

 glib/gslice.h    | 2 +-
 glib/gstrfuncs.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/glib/gslice.h b/glib/gslice.h
index 80762761f..ff8b02a65 100644
--- a/glib/gslice.h
+++ b/glib/gslice.h
@@ -34,7 +34,7 @@ GLIB_AVAILABLE_IN_ALL
 gpointer g_slice_alloc0                (gsize         block_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
 gpointer g_slice_copy                   (gsize         block_size,
-                                         gconstpointer mem_block) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(1);
+                                         gconstpointer mem_block) G_GNUC_ALLOC_SIZE(1);
 void     g_slice_free1                 (gsize         block_size,
                                         gpointer      mem_block);
diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
index d09de568c..b8790fc78 100644
--- a/glib/gstrfuncs.h
+++ b/glib/gstrfuncs.h
@@ -255,7 +255,7 @@ gchar*                g_strescape      (const gchar *source,
 gpointer              g_memdup        (gconstpointer mem,
-                                       guint          byte_size) G_GNUC_MALLOC G_GNUC_ALLOC_SIZE(2);
+                                       guint          byte_size) G_GNUC_ALLOC_SIZE(2);
 /* NULL terminated string arrays.
  * g_strsplit(), g_strsplit_set() split up string into max_tokens tokens

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]