From 968a1d65f430e4e8234204c62361e3d21cac810c Mon Sep 17 00:00:00 2001 From: David Rientjes Date: Mon, 14 Aug 2006 13:38:14 -0700 Subject: [PATCH] read-cache.c cleanup Removes conditional returns. Signed-off-by: David Rientjes Signed-off-by: Junio C Hamano --- read-cache.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/read-cache.c b/read-cache.c index c923a3270..b18f9f72d 100644 --- a/read-cache.c +++ b/read-cache.c @@ -880,10 +880,8 @@ static int write_index_ext_header(SHA_CTX *context, int fd, { ext = htonl(ext); sz = htonl(sz); - if ((ce_write(context, fd, &ext, 4) < 0) || - (ce_write(context, fd, &sz, 4) < 0)) - return -1; - return 0; + return ((ce_write(context, fd, &ext, 4) < 0) || + (ce_write(context, fd, &sz, 4) < 0)) ? -1 : 0; } static int ce_flush(SHA_CTX *context, int fd) @@ -905,9 +903,7 @@ static int ce_flush(SHA_CTX *context, int fd) /* Append the SHA1 signature at the end */ SHA1_Final(write_buffer + left, context); left += 20; - if (write(fd, write_buffer, left) != left) - return -1; - return 0; + return (write(fd, write_buffer, left) != left) ? -1 : 0; } static void ce_smudge_racily_clean_entry(struct cache_entry *ce) -- 2.30.2