From 13f1381ae529c80764625691ed24d7aaeec63d41 Mon Sep 17 00:00:00 2001 From: simransinghal Date: Sat, 31 Mar 2018 14:37:49 +0530 Subject: [PATCH] common: compress return logic Simplify function returns by merging assignment and return. Signed-off-by: Simran Singhal --- src/common/buffer.cc | 3 +-- src/common/ceph_crypto_cms.cc | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/common/buffer.cc b/src/common/buffer.cc index 11196de758c47..7e68fda84507b 100644 --- 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 109f702bf7399..0216c589d19ec 100644 --- 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); } -- 2.39.5