From: Joe Orton <jorton@apache.org>
Date: Fri, 5 Oct 2018 10:17:18 +0000 (+0000)
Subject: * modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2304
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c557a7ac3278425db7b27419524ccc33e83dcdb5;p=thirdparty%2Fapache%2Fhttpd.git

* modules/slotmem/mod_slotmem_shm.c (restore_slotmem): Remove
  redundant assignment (clang warning), the apr_file_eof(fp)=>APR_EOF
  case assigns rv to APR_EOF and then to APR_SUCCESS after already.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1842882 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/slotmem/mod_slotmem_shm.c b/modules/slotmem/mod_slotmem_shm.c
index 7dffef19fce..6dda8f65fec 100644
--- a/modules/slotmem/mod_slotmem_shm.c
+++ b/modules/slotmem/mod_slotmem_shm.c
@@ -214,7 +214,6 @@ static apr_status_t restore_slotmem(sharedslotdesc_t *desc,
         if (rv == APR_SUCCESS) {
             rv = apr_file_read_full(fp, ptr, nbytes, NULL);
             if (rv == APR_SUCCESS || rv == APR_EOF) {
-                rv = APR_SUCCESS;   /* for successful return @ EOF */
                 /*
                  * if at EOF, don't bother checking md5
                  *  - backwards compatibility