common: compress return logic

Simplify function returns by merging assignment and return.

Signed-off-by: Simran Singhal <singhalsimran0@gmail.com>

diff --git a/src/common/buffer.cc b/src/common/buffer.cc
index 11196de758c4766aa1c5b092b2e330af7f23808c..7e68fda84507b6b9187f87e0f0be1a82c0efdde7 100644 (file)
--- a/src/common/buffer.cc
+++ b/src/common/buffer.cc
@@ -2362,8 +2362,7 @@ static int do_writev(int fd, struct iovec *vec, uint64_t offset, unsigned veclen
 #else
     r = ::lseek64(fd, offset, SEEK_SET);
     if (r != offset) {
-      r = -errno;
-      return r;
+      return -errno;
     }
     r = ::writev(fd, vec, veclen);
 #endif

diff --git a/src/common/ceph_crypto_cms.cc b/src/common/ceph_crypto_cms.cc
index 109f702bf7399c9eaf1d74480172265f88cbbbeb..0216c589d19ec189da9966ec12b21f5dbd83c7b6 100644 (file)
--- a/src/common/ceph_crypto_cms.cc
+++ b/src/common/ceph_crypto_cms.cc
@@ -62,7 +62,6 @@ DigestFile(PLArenaPool *poolp, SECItem ***digests, SECItem *input,
            SECAlgorithmID **algids)
 {
     NSSCMSDigestContext *digcx;
-    SECStatus rv;
 
     digcx = NSS_CMSDigestContext_StartMultiple(algids);
     if (digcx == NULL)
@@ -70,8 +69,7 @@ DigestFile(PLArenaPool *poolp, SECItem ***digests, SECItem *input,
 
     NSS_CMSDigestContext_Update(digcx, input->data, input->len);
 
-    rv = NSS_CMSDigestContext_FinishMultiple(digcx, poolp, digests);
-    return rv;
+    return NSS_CMSDigestContext_FinishMultiple(digcx, poolp, digests);
 }