From e082c2c3dfced1cd20d7c1cb7ee7a661dffc8686 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 21 Nov 2014 09:58:09 +0100
Subject: Remove some unneeded NULL checks

Found by Coverity; also see commit 85fb2af3.
---
 stream/rar.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'stream')

diff --git a/stream/rar.c b/stream/rar.c
index 12d3b0bfd7..7fae5e35ac 100644
--- a/stream/rar.c
+++ b/stream/rar.c
@@ -438,13 +438,12 @@ ssize_t RarRead(rar_file_t *file, void *data, size_t size)
         if (max <= 0)
             break;
 
-        int r = file->s ? stream_read(file->s, data, max) : -1;
+        int r = stream_read(file->s, data, max);
         if (r <= 0)
             break;
 
         total += r;
-        if( data )
-            data = (char *)data + r;
+        data = (char *)data + r;
         file->i_pos += r;
         if (file->i_pos >= chunk_end &&
             RarSeek(file, file->i_pos))
-- 
cgit v1.2.3