diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-10-14 20:11:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-14 20:11:19 +0200 |
| commit | ca193035e95bab275b5e2d8481110f46d9c4360e (patch) | |
| tree | 42689a50db9a914a8830ac0dfa1cd6ed5c975e6d | |
| parent | e7aa9512e42e79dc5b0d744e68a394f29000ebdb (diff) | |
| parent | 40990eac272b007c581932cfdd9bb43b7805a686 (diff) | |
| download | systemd-ca193035e95bab275b5e2d8481110f46d9c4360e.tar.gz | |
Merge pull request #10394 from yuwata/fixes-found-by-clang
Fix warnings reported by clang
| -rw-r--r-- | src/busctl/busctl.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 4 | ||||
| -rw-r--r-- | src/test/test-json.c | 2 |
3 files changed, 4 insertions, 4 deletions
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); 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]; 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); } |