[libvirt] [PATCH 35/35] internal: remove no longer used ATTRIBUTE macros

Ján Tomko jtomko at redhat.com
Mon Oct 14 13:15:53 UTC 2019


Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 docs/apibuild.py |  2 --
 src/internal.h   | 31 -------------------------------
 2 files changed, 33 deletions(-)

diff --git a/docs/apibuild.py b/docs/apibuild.py
index b11d3fd5a9..4f0d170975 100755
--- a/docs/apibuild.py
+++ b/docs/apibuild.py
@@ -71,8 +71,6 @@ admin_included_files = {
 }
 
 ignored_words = {
-  "ATTRIBUTE_UNUSED": (0, "macro keyword"),
-  "ATTRIBUTE_SENTINEL": (0, "macro keyword"),
   "G_GNUC_UNUSED": (0, "macro keyword"),
   "G_GNUC_NULL_TERMINATED": (0, "macro keyword"),
   "VIR_DEPRECATED": (0, "macro keyword"),
diff --git a/src/internal.h b/src/internal.h
index 56e99241b0..7737d9a209 100644
--- a/src/internal.h
+++ b/src/internal.h
@@ -93,33 +93,6 @@
 #define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0)
 #define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array)))
 
-/**
- * ATTRIBUTE_UNUSED:
- *
- * Macro to flag consciously unused parameters to functions
- */
-#ifndef ATTRIBUTE_UNUSED
-# define ATTRIBUTE_UNUSED __attribute__((__unused__))
-#endif
-
-/**
- * ATTRIBUTE_NORETURN:
- *
- * Macro to indicate that a function won't return to the caller
- */
-#ifndef ATTRIBUTE_NORETURN
-# define ATTRIBUTE_NORETURN __attribute__((__noreturn__))
-#endif
-
-/**
- * ATTRIBUTE_SENTINEL:
- *
- * Macro to check for NULL-terminated varargs lists
- */
-#ifndef ATTRIBUTE_SENTINEL
-# define ATTRIBUTE_SENTINEL __attribute__((__sentinel__))
-#endif
-
 /**
  * ATTRIBUTE_NOINLINE:
  *
@@ -150,10 +123,6 @@
 # endif
 #endif
 
-#ifndef ATTRIBUTE_RETURN_CHECK
-# define ATTRIBUTE_RETURN_CHECK __attribute__((__warn_unused_result__))
-#endif
-
 /**
  * ATTRIBUTE_PACKED
  *
-- 
2.19.2




More information about the libvir-list mailing list