read-cache.c cleanup

Removes conditional returns.

Signed-off-by: David Rientjes <rientjes@google.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/read-cache.c b/read-cache.c
index c923a327071875c41c60273db135e7adce25cfbd..b18f9f72d91946816ad2cb248341e4b45c745cba 100644 (file)
--- 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);
 {
        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)
 }
 
 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;
        /* 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)
 }
 
 static void ce_smudge_racily_clean_entry(struct cache_entry *ce)