From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 30 Oct 2011 16:22:46 +0000 (+0000)
Subject: Rename a couple of variables in get_last_url()
X-Git-Tag: v_3_0_18~54
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=d4e909d93d0ebfe18a51890afdabc3adc9376bd3

Rename a couple of variables in get_last_url()
---

diff --git a/filters.c b/filters.c
index 4de7c900..adcea9ac 100644
--- a/filters.c
+++ b/filters.c
@@ -1,4 +1,4 @@
-const char filters_rcs[] = "$Id: filters.c,v 1.152 2011/10/30 16:18:12 fabiankeil Exp $";
+const char filters_rcs[] = "$Id: filters.c,v 1.153 2011/10/30 16:20:12 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/filters.c,v $
@@ -1135,15 +1135,15 @@ char *get_last_url(char *subject, const char *redirect_mode)
             log_error(LOG_LEVEL_ERROR, "Unable to decode \"%s\".", token);
             continue;
          }
-         char *h1 = strstr(dtoken, "http://");
-         char *h2 = strstr(dtoken, "https://");
-         char *h = (h1 && h2
-                    ? (h1 < h2 ? h1 : h2)
-                    : (h1 ? h1 : h2));
-         if (h)
+         char *http_url = strstr(dtoken, "http://");
+         char *https_url = strstr(dtoken, "https://");
+         char *last_url = (http_url && https_url
+                          ? (http_url < https_url ? http_url : https_url)
+                          : (http_url ? http_url : https_url));
+         if (last_url)
          {
             freez(found);
-            found = strdup(h);
+            found = strdup(last_url);
             if (found == NULL)
             {
                log_error(LOG_LEVEL_ERROR,