From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Jul 2021 18:44:49 +0000 (+0200)
Subject: sd-bus: add brief inline comment explaining the "reserved" field in the bus vtable... 
X-Git-Tag: v250-rc1~905^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F20339%2Fhead;p=thirdparty%2Fsystemd.git

sd-bus: add brief inline comment explaining the "reserved" field in the bus vtable structure

Follow-up for: #20253
---

diff --git a/src/systemd/sd-bus-vtable.h b/src/systemd/sd-bus-vtable.h
index 438c651cb28..8b316fac5ac 100644
--- a/src/systemd/sd-bus-vtable.h
+++ b/src/systemd/sd-bus-vtable.h
@@ -76,7 +76,10 @@ struct sd_bus_vtable {
                         const unsigned *vtable_format_reference;
                 } start;
                 struct {
-                        size_t reserved;
+                        /* This field exists only to make sure we have something to initialize in
+                         * SD_BUS_VTABLE_END in a way that is both compatible with pedantic versions of C and
+                         * C++. It's unused otherwise. */
+                        size_t _reserved;
                 } end;
                 struct {
                         const char *member;
@@ -190,7 +193,7 @@ struct sd_bus_vtable {
                 .flags = 0,                                             \
                 .x = {                                                  \
                         .end = {                                        \
-                                .reserved = 0,                          \
+                                ._reserved = 0,                         \
                         },                                              \
                 },                                                      \
         }