From f9eb79bbbf30f24135165a2a33aa2a80916b4005 Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Mon, 12 Mar 2018 14:38:57 -0700 Subject: [PATCH] cls/rgw: usage_iterate_range truncated should never be NULL Ensuring truncated is non-NULL improves code clarity. Suggested-by: Yehuda Sadeh Signed-off-by: Robin H. Johnson --- src/cls/rgw/cls_rgw.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc index 90191ac4c695e..187f980cf1271 100644 --- a/src/cls/rgw/cls_rgw.cc +++ b/src/cls/rgw/cls_rgw.cc @@ -2916,6 +2916,8 @@ static int usage_iterate_range(cls_method_context_t hctx, uint64_t start, uint64 string user_key; bool truncated_status = false; + assert(truncated != nullptr); + if (!by_user) { usage_record_prefix_by_time(end, end_key); } else { @@ -2938,9 +2940,7 @@ static int usage_iterate_range(cls_method_context_t hctx, uint64_t start, uint64 if (ret < 0) return ret; - if (truncated) { - *truncated = truncated_status; - } + *truncated = truncated_status; map::iterator iter = keys.begin(); if (iter == keys.end()) @@ -2954,18 +2954,14 @@ static int usage_iterate_range(cls_method_context_t hctx, uint64_t start, uint64 if (!by_user && key.compare(end_key) >= 0) { CLS_LOG(20, "usage_iterate_range reached key=%s, done", key.c_str()); - if (truncated) { - *truncated = false; - } + *truncated = false; key_iter = key; return 0; } if (by_user && key.compare(0, user_key.size(), user_key) != 0) { CLS_LOG(20, "usage_iterate_range reached key=%s, done", key.c_str()); - if (truncated) { - *truncated = false; - } + *truncated = false; key_iter = key; return 0; } -- 2.39.5