Axe some code duplication.

Use 'ap_array_str_contains()' instead of 'ctutil_in_array()'

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

diff --git a/modules/ssl/ssl_ct_util.c b/modules/ssl/ssl_ct_util.c
index 4114bf6d1fb8a1ee571d22325cd678fe7905dc33..b3c16dede4b5875cfb31cb782dd7f58669bf17c0 100644 (file)
--- a/modules/ssl/ssl_ct_util.c
+++ b/modules/ssl/ssl_ct_util.c
@@ -91,21 +91,6 @@ void ctutil_buffer_to_array(apr_pool_t *p, const char *b,
     *out = arr;
 }
 
-int ctutil_in_array(const char *needle, const apr_array_header_t *haystack)
-{
-    const char * const *elts;
-    int i;
-
-    elts = (const char * const *)haystack->elts;
-    for (i = 0; i < haystack->nelts; i++) {
-        if (!strcmp(needle, elts[i])) {
-            return 1;
-        }
-    }
-
-    return 0;
-}
-
 apr_status_t ctutil_fopen(const char *fn, const char *mode, FILE **f)
 {
     apr_status_t rv;
@@ -674,10 +659,10 @@ void ctutil_run_internal_tests(apr_pool_t *p)
 
     ctutil_buffer_to_array(p, filecontents, strlen(filecontents), &arr);
     
-    ap_assert(ctutil_in_array(TESTURL1, arr));
-    ap_assert(ctutil_in_array(TESTURL2, arr));
-    ap_assert(ctutil_in_array(TESTURL3, arr));
-    ap_assert(!ctutil_in_array(TESTURL1 "x", arr));
+    ap_assert(ap_array_str_contains(arr, TESTURL1));
+    ap_assert(ap_array_str_contains(arr, TESTURL2));
+    ap_assert(ap_array_str_contains(arr, TESTURL3));
+    ap_assert(!ap_array_str_contains(arr, TESTURL1 "x"));
 
     ch = buf;
     avail = 8;

diff --git a/modules/ssl/ssl_ct_util.h b/modules/ssl/ssl_ct_util.h
index d1f58beef37e1639a219ba4afca0f472759d0829..9eee64ab4460b5b8969e0e6dca50a2de05a8efe6 100644 (file)
--- a/modules/ssl/ssl_ct_util.h
+++ b/modules/ssl/ssl_ct_util.h
@@ -29,8 +29,6 @@ int ctutil_file_exists(apr_pool_t *p, const char *filename);
 void ctutil_buffer_to_array(apr_pool_t *p, const char *b,
                             apr_size_t b_size, apr_array_header_t **out);
 
-int ctutil_in_array(const char *needle, const apr_array_header_t *haystack);
-
 apr_status_t ctutil_fopen(const char *fn, const char *mode, FILE **f);
 
 apr_status_t ctutil_read_dir(apr_pool_t *p,