Clean shmcb iterator call syntax and return value

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

diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c
index bba1e9a47748e1006770ec75ae16f5ce68343c0d..a56b8d9f789a308e5adc9af2b7e75b12e133cb7c 100644 (file)
--- a/modules/cache/mod_socache_shmcb.c
+++ b/modules/cache/mod_socache_shmcb.c
@@ -972,8 +972,8 @@ static apr_status_t shmcb_subcache_iterate(ap_socache_instance_t *instance,
                                          data_offset, dest_len);
                 dest[dest_len] = '\0';
 
-                rv = (*iterator)(instance, s, userctx, id, idx->id_len,
-                                 dest, dest_len, pool);
+                rv = iterator(instance, s, userctx, id, idx->id_len,
+                              dest, dest_len, pool);
                 ap_log_error(APLOG_MARK, APLOG_DEBUG, rv, s,
                              "shmcb entry iterated");
                 if (rv != APR_SUCCESS)
@@ -991,7 +991,7 @@ static apr_status_t shmcb_subcache_iterate(ap_socache_instance_t *instance,
         pos = SHMCB_CYCLIC_INCREMENT(pos, 1, header->index_num);
     }
 
-    return -1; /* failure */
+    return APR_SUCCESS;
 }
 
 static const ap_socache_provider_t socache_shmcb = {