From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 22 May 2024 20:49:35 +0000 (-0400)
Subject: rgw: RGWDeleteMultiObj uses constexpr variable
X-Git-Tag: testing/wip-pdonnell-testing-20240608.193933-debug~14^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ab60a7f3ed5e990fbe15efa3e0f5ee7388c7d737;p=ceph-ci.git

rgw: RGWDeleteMultiObj uses constexpr variable

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index d9fd97781c6..95e382435bc 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -6798,12 +6798,12 @@ void RGWDeleteMultiObj::execute(optional_yield y)
     return;
   }
 
-#define DELETE_MULTI_OBJ_MAX_NUM      1000
+  constexpr int DEFAULT_MAX_NUM = 1000;
   int max_num = s->cct->_conf->rgw_delete_multi_obj_max_num;
   if (max_num < 0) {
-    max_num = DELETE_MULTI_OBJ_MAX_NUM;
+    max_num = DEFAULT_MAX_NUM;
   }
-  int multi_delete_object_num = multi_delete->objects.size();
+  const int multi_delete_object_num = multi_delete->objects.size();
   if (multi_delete_object_num > max_num) {
     op_ret = -ERR_MALFORMED_XML;
     return;