Remove variable only used for an assert

When compiled with -DNDEBUG, we get warnings about set-but-unused variables.
In general, it's not something we care about, but since removing those
variables arguably makes the code nicer, let's just to it in this case.

diff --git a/src/basic/gcrypt-util.c b/src/basic/gcrypt-util.c
index f304a2bab69f9d9af22cdc81b6ca1ff652117dd0..9bab47dd8a02613d8f089e4879ecca3837fa1236 100644 (file)
--- a/src/basic/gcrypt-util.c
+++ b/src/basic/gcrypt-util.c
@@ -7,12 +7,10 @@
 #include "hexdecoct.h"
 
 void initialize_libgcrypt(bool secmem) {
-        const char *p;
         if (gcry_control(GCRYCTL_INITIALIZATION_FINISHED_P))
                 return;
 
-        p = gcry_check_version("1.4.5");
-        assert(p);
+        assert_se(gcry_check_version("1.4.5"));
 
         /* Turn off "secmem". Clients which wish to make use of this
          * feature should initialize the library manually */

diff --git a/src/libsystemd/sd-device/device-enumerator.c b/src/libsystemd/sd-device/device-enumerator.c
index 4da6e652106866825d67e5bfd68c0bb831652415..4357860170a5f905fd14880e6570719485232a14 100644 (file)
--- a/src/libsystemd/sd-device/device-enumerator.c
+++ b/src/libsystemd/sd-device/device-enumerator.c
@@ -428,7 +428,6 @@ static bool match_tag(sd_device_enumerator *enumerator, sd_device *device) {
 static bool match_parent(sd_device_enumerator *enumerator, sd_device *device) {
         const char *syspath_parent, *syspath;
         Iterator i;
-        int r;
 
         assert(enumerator);
         assert(device);
@@ -436,8 +435,7 @@ static bool match_parent(sd_device_enumerator *enumerator, sd_device *device) {
         if (set_isempty(enumerator->match_parent))
                 return true;
 
-        r = sd_device_get_syspath(device, &syspath);
-        assert(r >= 0);
+        assert_se(sd_device_get_syspath(device, &syspath) >= 0);
 
         SET_FOREACH(syspath_parent, enumerator->match_parent, i)
                 if (path_startswith(syspath, syspath_parent))

diff --git a/src/network/netdev/fou-tunnel.c b/src/network/netdev/fou-tunnel.c
index 65dad384e2213d13a5ede5df4a99c81b7e84a295..4dbcb574df50f1db79b15e05e9837d4849d58f08 100644 (file)
--- a/src/network/netdev/fou-tunnel.c
+++ b/src/network/netdev/fou-tunnel.c
@@ -64,14 +64,10 @@ static int netdev_fill_fou_tunnel_message(NetDev *netdev, sd_netlink_message **r
 static int netdev_fou_tunnel_create(NetDev *netdev) {
         _cleanup_(sd_netlink_message_unrefp) sd_netlink_message *m = NULL;
         uint32_t serial;
-        FouTunnel *t;
         int r;
 
         assert(netdev);
-
-        t = FOU(netdev);
-
-        assert(t);
+        assert(FOU(netdev));
 
         r = netdev_fill_fou_tunnel_message(netdev, &m);
         if (r < 0)

diff --git a/src/network/netdev/wireguard.c b/src/network/netdev/wireguard.c
index 73c5402972ffe5ec68d2eed609b22ab9f06aece4..03eaac1f9cba59026fa1bf3eca52558dec27d766 100644 (file)
--- a/src/network/netdev/wireguard.c
+++ b/src/network/netdev/wireguard.c
@@ -430,11 +430,8 @@ static void resolve_endpoints(NetDev *netdev) {
 }
 
 static int netdev_wireguard_post_create(NetDev *netdev, Link *link, sd_netlink_message *m) {
-        Wireguard *w;
-
         assert(netdev);
-        w = WIREGUARD(netdev);
-        assert(w);
+        assert(WIREGUARD(netdev));
 
         (void) wireguard_set_interface(netdev);
         resolve_endpoints(netdev);

diff --git a/src/shared/fstab-util.h b/src/shared/fstab-util.h
index 9820f78ca858b228f34240cf2da8e5fcb56e65ac..08622565113b82420b06e297ab82fc22ae8e0ca2 100644 (file)
--- a/src/shared/fstab-util.h
+++ b/src/shared/fstab-util.h
@@ -20,14 +20,12 @@ static inline bool fstab_test_option(const char *opts, const char *names) {
 int fstab_find_pri(const char *options, int *ret);
 
 static inline bool fstab_test_yes_no_option(const char *opts, const char *yes_no) {
-        int r;
         const char *opt;
 
         /* If first name given is last, return 1.
          * If second name given is last or neither is found, return 0. */
 
-        r = fstab_filter_options(opts, yes_no, &opt, NULL, NULL);
-        assert(r >= 0);
+        assert_se(fstab_filter_options(opts, yes_no, &opt, NULL, NULL) >= 0);
 
         return opt == yes_no;
 }