This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 2/3 v2] sys/cdefs.h: export __attribute_alloc_size__
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Thu, 24 Jan 2013 22:41:12 -0500
- Subject: [PATCH 2/3 v2] sys/cdefs.h: export __attribute_alloc_size__
- References: <1356817894-16212-1-git-send-email-vapier@gentoo.org><1359085273-5605-1-git-send-email-vapier@gentoo.org>
Since we want to use this in installed headers, move it to the installed
sys/cdefs.h. This requires a slight tweaking of the name (add trailing
underscores).
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
2012-12-30 Mike Frysinger <vapier@gentoo.org>
* include/programs/xmalloc.h: Change __attribute_alloc_size to
__attribute_alloc_size__.
* include/sys/cdefs.h (__attribute_alloc_size): Macro removed.
* misc/sys/cdefs.h (__attribute_alloc_size__): New macro.
---
v2
- change macro style to avoid __VA_ARGS__
include/programs/xmalloc.h | 6 +++---
include/sys/cdefs.h | 2 --
misc/sys/cdefs.h | 9 +++++++++
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/include/programs/xmalloc.h b/include/programs/xmalloc.h
index 550542a..d5f2954 100644
--- a/include/programs/xmalloc.h
+++ b/include/programs/xmalloc.h
@@ -24,11 +24,11 @@
/* Prototypes for a few program-wide used functions. */
extern void *xmalloc (size_t n)
- __attribute_malloc__ __attribute_alloc_size (1);
+ __attribute_malloc__ __attribute_alloc_size__ ((1));
extern void *xcalloc (size_t n, size_t s)
- __attribute_malloc__ __attribute_alloc_size (1, 2);
+ __attribute_malloc__ __attribute_alloc_size__ ((1, 2));
extern void *xrealloc (void *o, size_t n)
- __attribute_malloc__ __attribute_alloc_size (2);
+ __attribute_malloc__ __attribute_alloc_size__ ((2));
extern char *xstrdup (const char *) __attribute_malloc__;
#endif /* xmalloc.h */
diff --git a/include/sys/cdefs.h b/include/sys/cdefs.h
index 71baa1a..524fe57 100644
--- a/include/sys/cdefs.h
+++ b/include/sys/cdefs.h
@@ -13,8 +13,6 @@ extern void __chk_fail (void) __attribute__ ((__noreturn__));
libc_hidden_proto (__chk_fail)
rtld_hidden_proto (__chk_fail)
-
-# define __attribute_alloc_size(...) __attribute__ ((alloc_size (__VA_ARGS__)))
#endif
#endif
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 81ab318..f9e58b6 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -222,6 +222,15 @@
# define __attribute_malloc__ /* Ignore */
#endif
+/* Tell the compiler which arguments to an allocation function
+ indicate the size of the allocation. */
+#if __GNUC_PREREQ (4, 3)
+# define __attribute_alloc_size__(params) \
+ __attribute__ ((__alloc_size__ params))
+#else
+# define __attribute_alloc_size__(params) /* Ignore. */
+#endif
+
/* At some point during the gcc 2.96 development the `pure' attribute
for functions was introduced. We don't want to use it unconditionally
(although this would be possible) since it generates warnings. */
--
1.8.0.2