From: Felipe Sateler <fsateler@users.noreply.github.com>
Date: Tue, 23 Aug 2016 09:29:30 +0000 (-0300)
Subject: core,network: Use const qualifiers for block-local variables in macro functions ... 
X-Git-Tag: v232~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dec4a9d2d8301102e12f8cf1d9a646e685fb1ea;p=thirdparty%2Fsystemd.git

core,network: Use const qualifiers for block-local variables in macro functions (#4019)

Prevents discard-qualifiers warnings when the passed variable was const
---

diff --git a/src/core/selinux-access.h b/src/core/selinux-access.h
index 8f1f058a32f..f46370d0204 100644
--- a/src/core/selinux-access.h
+++ b/src/core/selinux-access.h
@@ -33,7 +33,7 @@ int mac_selinux_generic_access_check(sd_bus_message *message, const char *path,
 
 #define mac_selinux_unit_access_check(unit, message, permission, error) \
         ({                                                              \
-                Unit *_unit = (unit);                                   \
+                const Unit *_unit = (unit);                             \
                 mac_selinux_generic_access_check((message), _unit->source_path ?: _unit->fragment_path, (permission), (error)); \
         })
 
diff --git a/src/core/unit.h b/src/core/unit.h
index 53875653d7b..f7a65782f1c 100644
--- a/src/core/unit.h
+++ b/src/core/unit.h
@@ -639,7 +639,7 @@ void unit_notify_user_lookup(Unit *u, uid_t uid, gid_t gid);
 
 #define log_unit_full(unit, level, error, ...)                          \
         ({                                                              \
-                Unit *_u = (unit);                                      \
+                const Unit *_u = (unit);                                \
                 _u ? log_object_internal(level, error, __FILE__, __LINE__, __func__, _u->manager->unit_log_field, _u->id, ##__VA_ARGS__) : \
                         log_internal(level, error, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
         })
diff --git a/src/network/networkd-link.h b/src/network/networkd-link.h
index 2809b1fe0b9..05b2a2b3234 100644
--- a/src/network/networkd-link.h
+++ b/src/network/networkd-link.h
@@ -186,7 +186,7 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Link*, link_unref);
 
 #define log_link_full(link, level, error, ...)                          \
         ({                                                              \
-                Link *_l = (link);                                      \
+                const Link *_l = (link);                                \
                 _l ? log_object_internal(level, error, __FILE__, __LINE__, __func__, "INTERFACE=", _l->ifname, ##__VA_ARGS__) : \
                         log_internal(level, error, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
         })                                                              \
diff --git a/src/network/networkd-netdev.h b/src/network/networkd-netdev.h
index b92a973b855..09863e72b4a 100644
--- a/src/network/networkd-netdev.h
+++ b/src/network/networkd-netdev.h
@@ -180,7 +180,7 @@ const struct ConfigPerfItem* network_netdev_gperf_lookup(const char *key, unsign
 
 #define log_netdev_full(netdev, level, error, ...)                      \
         ({                                                              \
-                NetDev *_n = (netdev);                                  \
+                const NetDev *_n = (netdev);                            \
                 _n ? log_object_internal(level, error, __FILE__, __LINE__, __func__, "INTERFACE=", _n->ifname, ##__VA_ARGS__) : \
                         log_internal(level, error, __FILE__, __LINE__, __func__, ##__VA_ARGS__); \
         })