Merge pull request ceph#57331 from ronen-fr/wip-rf-tier0

ronen-fr · web-flow · commit f809df25668b · 2024-05-09T17:53:37.000+03:00
tests/librados: do not use '0' as a string

Reviewed-by: Patrick Donnelly &lt;pdonnell@redhat.com&gt;
diff --git a/src/test/librados/tier_cxx.cc b/src/test/librados/tier_cxx.cc
@@ -120,7 +120,7 @@ static inline void buf_to_hex(const unsigned char *buf, int len, char *str)
 }
 
 void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count,
-			   std::string fp_algo = NULL)
+			   std::string fp_algo = std::string{})
 {
   bufferlist t;
   int size = foid.length();
@@ -148,7 +148,7 @@ void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t co
   ASSERT_LE(count, refs.count());
 }
 
-string get_fp_oid(string oid, std::string fp_algo = NULL)
+string get_fp_oid(string oid, std::string fp_algo = std::string{})
 {
   if (fp_algo == "sha1") {
     unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 1];

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ static inline void buf_to_hex(const unsigned char buf, int len, char str)`
`120`	`120`	`}`
`121`	`121`
`122`	`122`	`void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t count,`
`123`		`- std::string fp_algo = NULL)`
	`123`	`+ std::string fp_algo = std::string{})`
`124`	`124`	`{`
`125`	`125`	`bufferlist t;`
`126`	`126`	`int size = foid.length();`
`@@ -148,7 +148,7 @@ void check_fp_oid_refcount(librados::IoCtx& ioctx, std::string foid, uint64_t co`
`148`	`148`	`ASSERT_LE(count, refs.count());`
`149`	`149`	`}`
`150`	`150`
`151`		`-string get_fp_oid(string oid, std::string fp_algo = NULL)`
	`151`	`+string get_fp_oid(string oid, std::string fp_algo = std::string{})`
`152`	`152`	`{`
`153`	`153`	`if (fp_algo == "sha1") {`
`154`	`154`	`unsigned char fingerprint[CEPH_CRYPTO_SHA1_DIGESTSIZE + 1];`