From: Kefu Chai Date: Mon, 12 Apr 2021 09:32:59 +0000 (+0800) Subject: mon,osd: always init local variable X-Git-Tag: v16.2.6~149^2~1 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99ce165dd3aba44768d0b8fe988e1304e4edaa88;p=ceph.git mon,osd: always init local variable this change silences the warning like: ../src/mon/Monitor.cc: In member function ‘void Monitor::handle_command(MonOpRequestRef)’: ../src/mon/Monitor.cc:3703:55: warning: ‘osd’ may be used uninitialized in this function [-Wmaybe-uninitialized] 3703 | uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd); | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~ Signed-off-by: Kefu Chai (cherry picked from commit 7c2f58ea5ec70e5606ab362e6f4cfda087cec65a) --- diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 7848f9722b8e..3f2e2dc03666 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -3690,7 +3690,7 @@ void Monitor::handle_command(MonOpRequestRef op) rs = ss2.str(); r = 0; } else if (prefix == "osd last-stat-seq") { - int64_t osd; + int64_t osd = 0; cmd_getval(cmdmap, "id", osd); uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd); if (f) { diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 4a13ffd9719a..eb213c1be228 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -1596,12 +1596,12 @@ public: } int64_t get_dedup_tier() const { - int64_t tier_id; + int64_t tier_id = 0; opts.get(pool_opts_t::DEDUP_TIER, &tier_id); return tier_id; } int64_t get_dedup_cdc_chunk_size() const { - int64_t chunk_size; + int64_t chunk_size = 0; opts.get(pool_opts_t::DEDUP_CDC_CHUNK_SIZE, &chunk_size); return chunk_size; }