From cb16b085c01d3a389c955036b472b97955cf542d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 13 Oct 2018 23:50:04 +0900 Subject: [PATCH 1/3] core: set _unused_ attribute to 'reloading' Follow-up for 4df7d537c8203557d330b68ba7833515ddd4e985. --- src/core/manager.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index af84a0a769..002429f1ec 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -3096,7 +3096,7 @@ int manager_serialize( assert(f); assert(fds); - _cleanup_(manager_reloading_stopp) Manager *reloading = manager_reloading_start(m); + _cleanup_(manager_reloading_stopp) _unused_ Manager *reloading = manager_reloading_start(m); fprintf(f, "current-job-id=%"PRIu32"\n", m->current_job_id); fprintf(f, "n-installed-jobs=%u\n", m->n_installed_jobs); @@ -3217,7 +3217,7 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { /* If we are not in reload mode yet, enter it now. Not that this is recursive, a caller might already have * increased it to non-zero, which is why we just increase it by one here and down again at the end of this * call. */ - _cleanup_(manager_reloading_stopp) Manager *reloading = manager_reloading_start(m); + _cleanup_(manager_reloading_stopp) _unused_ Manager *reloading = manager_reloading_start(m); for (;;) { char line[LINE_MAX]; From 172e4806dd55e00e3713779846d58761dc50a733 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 13 Oct 2018 23:56:07 +0900 Subject: [PATCH 2/3] busctl: drop unused variable --- src/busctl/busctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c index a5673731c0..2f056ac834 100644 --- a/src/busctl/busctl.c +++ b/src/busctl/busctl.c @@ -1592,7 +1592,7 @@ finish: } static int json_transform_variant(sd_bus_message *m, const char *contents, JsonVariant **ret) { - _cleanup_(json_variant_unrefp) JsonVariant *type = NULL, *value = NULL; + _cleanup_(json_variant_unrefp) JsonVariant *value = NULL; int r; assert(m); From 40990eac272b007c581932cfdd9bb43b7805a686 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 13 Oct 2018 23:59:16 +0900 Subject: [PATCH 3/3] test: use fabsl instead of fabs as json_variant_real() returns 'long double' --- src/test/test-json.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-json.c b/src/test/test-json.c index c1c2105913..e145559ae9 100644 --- a/src/test/test-json.c +++ b/src/test/test-json.c @@ -208,7 +208,7 @@ static void test_2(JsonVariant *v) { /* has thisisaverylongproperty */ p = json_variant_by_key(v, "thisisaverylongproperty"); - assert_se(p && json_variant_type(p) == JSON_VARIANT_REAL && fabs(json_variant_real(p) - 1.27) < 0.001); + assert_se(p && json_variant_type(p) == JSON_VARIANT_REAL && fabsl(json_variant_real(p) - 1.27) < 0.001); }