From: Benjamin Robin <dev@benjarobin.fr>
Date: Wed, 6 May 2020 18:29:31 +0000 (+0200)
Subject: tree-wide: Mark as _unused_ variables that are only used in assert()
X-Git-Tag: v246-rc1~424^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a0e594a26efe69afc3b05529dc0145a8d674e12;p=thirdparty%2Fsystemd.git

tree-wide: Mark as _unused_ variables that are only used in assert()

Allow to build without any warning with NDEBUG defined
---

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index b16c62a5c7c..9c24bb780a4 100644
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -2889,7 +2889,7 @@ int config_parse_syscall_filter(
                 void *userdata) {
 
         ExecContext *c = data;
-        const Unit *u = userdata;
+        _unused_ const Unit *u = userdata;
         bool invert = false;
         const char *p;
         int r;
diff --git a/src/journal/fsprg.c b/src/journal/fsprg.c
index 1dda2149d46..0ef3df89df2 100644
--- a/src/journal/fsprg.c
+++ b/src/journal/fsprg.c
@@ -60,7 +60,7 @@ static void mpi_export(void *buf, size_t buflen, const gcry_mpi_t x) {
 
 static gcry_mpi_t mpi_import(const void *buf, size_t buflen) {
         gcry_mpi_t h;
-        unsigned len;
+        _unused_ unsigned len;
 
         assert_se(gcry_mpi_scan(&h, GCRYMPI_FMT_USG, buf, buflen, NULL) == 0);
         len = (gcry_mpi_get_nbits(h) + 7) / 8;
diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c
index 47fc53167e0..20794451f5e 100644
--- a/src/login/logind-dbus.c
+++ b/src/login/logind-dbus.c
@@ -2567,7 +2567,7 @@ static int method_can_reboot_parameter(
                 void *userdata,
                 sd_bus_error *error) {
 
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         int r;
 
         assert(message);
@@ -2699,7 +2699,7 @@ static int method_can_reboot_to_firmware_setup(
                 void *userdata,
                 sd_bus_error *error) {
 
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         int r;
 
         assert(message);
@@ -2888,7 +2888,7 @@ static int method_can_reboot_to_boot_loader_menu(
                 void *userdata,
                 sd_bus_error *error) {
 
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         int r;
 
         assert(message);
@@ -3079,7 +3079,7 @@ static int method_can_reboot_to_boot_loader_entry(
                 void *userdata,
                 sd_bus_error *error) {
 
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         int r;
 
         assert(message);
diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index ceb3afadbdd..865ce7baada 100644
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -112,7 +112,7 @@ static int method_get_machine(sd_bus_message *message, void *userdata, sd_bus_er
 
 static int method_get_image(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_free_ char *p = NULL;
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         const char *name;
         int r;
 
@@ -471,7 +471,7 @@ static int method_get_machine_os_release(sd_bus_message *message, void *userdata
 static int method_list_images(sd_bus_message *message, void *userdata, sd_bus_error *error) {
         _cleanup_(sd_bus_message_unrefp) sd_bus_message *reply = NULL;
         _cleanup_hashmap_free_ Hashmap *images = NULL;
-        Manager *m = userdata;
+        _unused_ Manager *m = userdata;
         Image *image;
         Iterator i;
         int r;
diff --git a/src/network/networkd-manager.c b/src/network/networkd-manager.c
index 3e9fb8c2179..f9b611e4194 100644
--- a/src/network/networkd-manager.c
+++ b/src/network/networkd-manager.c
@@ -2233,7 +2233,7 @@ void manager_dirty(Manager *manager) {
 }
 
 static int set_hostname_handler(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
-        Manager *manager = userdata;
+        _unused_ Manager *manager = userdata;
         const sd_bus_error *e;
 
         assert(m);
@@ -2279,7 +2279,7 @@ int manager_set_hostname(Manager *m, const char *hostname) {
 }
 
 static int set_timezone_handler(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) {
-        Manager *manager = userdata;
+        _unused_ Manager *manager = userdata;
         const sd_bus_error *e;
 
         assert(m);
diff --git a/src/shared/resize-fs.c b/src/shared/resize-fs.c
index 5ed26a6c923..0abd289fecf 100644
--- a/src/shared/resize-fs.c
+++ b/src/shared/resize-fs.c
@@ -15,7 +15,6 @@
 
 int resize_fs(int fd, uint64_t sz, uint64_t *ret_size) {
         struct statfs sfs;
-        int r;
 
         assert(fd >= 0);
 
@@ -42,6 +41,7 @@ int resize_fs(int fd, uint64_t sz, uint64_t *ret_size) {
                         *ret_size = u * sfs.f_bsize;
 
         } else if (is_fs_type(&sfs, BTRFS_SUPER_MAGIC)) {
+                _unused_ int r;
                 struct btrfs_ioctl_vol_args args = {};
 
                 /* 256M is the minimize size enforced by the btrfs kernel code when resizing (which is