From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 11 Dec 2015 04:17:42 +0000 (+0000)
Subject: Use 'ap_array_str_contains' to simplify code.
X-Git-Tag: 2.5.0-alpha~2547
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34253d88fb7242b1a5e7bef8c91ae4aeb2302800;p=thirdparty%2Fapache%2Fhttpd.git

Use 'ap_array_str_contains' to simplify code.

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

diff --git a/modules/mappers/mod_negotiation.c b/modules/mappers/mod_negotiation.c
index a165d875216..aaa55ca3e83 100644
--- a/modules/mappers/mod_negotiation.c
+++ b/modules/mappers/mod_negotiation.c
@@ -2238,20 +2238,14 @@ static int is_variant_better(negotiation_state *neg, var_rec *variant,
  */
 static int variant_has_language(var_rec *variant, const char *lang)
 {
-    int j, max;
-
     /* fast exit */
     if (   !lang
-        || !variant->content_languages
-        || !(max = variant->content_languages->nelts)) {
+        || !variant->content_languages) {
         return 0;
     }
 
-    for (j = 0; j < max; ++j) {
-        if (!strcmp(lang,
-                    ((char **) (variant->content_languages->elts))[j])) {
-            return 1;
-        }
+    if (ap_array_str_contains(variant->content_languages, lang)) {
+        return 1;
     }
 
     return 0;