bus: introduce new SD_BUS_VTABLE_HIDDEN flag for vtable members

[elogind.git] / src / systemd / sd-bus-vtable.h

diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index d1642bae5ec69fae0fc41bb8d74f55c1bf2d71ca..5400e9a6612f86e1a2828d3ffa783b40af409758 100644 (file)
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -22,37 +22,42 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 

-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "_sd-common.h"
+
+_SD_BEGIN_DECLARATIONS;

 
 typedef struct sd_bus_vtable sd_bus_vtable;
 
 #include "sd-bus.h"
 
 enum {
 
 typedef struct sd_bus_vtable sd_bus_vtable;
 
 #include "sd-bus.h"
 
 enum {

-        _SD_BUS_VTABLE_START = '<',
-        _SD_BUS_VTABLE_END = '>',
-        _SD_BUS_VTABLE_METHOD = 'M',
-        _SD_BUS_VTABLE_SIGNAL = 'S',
-        _SD_BUS_VTABLE_PROPERTY = 'P',
+        _SD_BUS_VTABLE_START             = '<',
+        _SD_BUS_VTABLE_END               = '>',
+        _SD_BUS_VTABLE_METHOD            = 'M',
+        _SD_BUS_VTABLE_SIGNAL            = 'S',
+        _SD_BUS_VTABLE_PROPERTY          = 'P',

         _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W',
         _SD_BUS_VTABLE_WRITABLE_PROPERTY = 'W',

-        _SD_BUS_VTABLE_CHILDREN = 'C'
+        _SD_BUS_VTABLE_CHILDREN          = 'C',

 };
 
 enum {
 };
 
 enum {

-        SD_BUS_VTABLE_DEPRECATED = 1,
-        SD_BUS_VTABLE_METHOD_NO_REPLY = 2,
-        SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE = 4,
-        SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY = 8,
+        SD_BUS_VTABLE_DEPRECATED               = 1ULL << 0,
+        SD_BUS_VTABLE_METHOD_NO_REPLY          = 1ULL << 1,
+        SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE    = 1ULL << 2,
+        SD_BUS_VTABLE_PROPERTY_INVALIDATE_ONLY = 1ULL << 3,
+        SD_BUS_VTABLE_UNPRIVILEGED             = 1ULL << 4,
+        SD_BUS_VTABLE_HIDDEN                   = 1ULL << 5,
+        _SD_BUS_VTABLE_CAPABILITY_MASK         = 0xFFFFULL << 40

 };
 
 };
 

+#define SD_BUS_VTABLE_CAPABILITY(x) ((uint64_t) (((x)+1) & 0xFFFF) << 40)
+

 struct sd_bus_vtable {
         /* Please do not initialize this structure directly, use the
          * macros below instead */
 
 struct sd_bus_vtable {
         /* Please do not initialize this structure directly, use the
          * macros below instead */
 

-        int type;
-        int flags;
+        uint8_t type:8;
+        uint64_t flags:56;

         union {
                 struct {
                         size_t element_size;
         union {
                 struct {
                         size_t element_size;


@@ -128,8 +133,6 @@ struct sd_bus_vtable {
                 .type = _SD_BUS_VTABLE_END,                             \
         }
 
                 .type = _SD_BUS_VTABLE_END,                             \
         }
 

-#ifdef __cplusplus
-}
-#endif
+_SD_END_DECLARATIONS;

 
 #endif
 
 #endif