Skip to content

U
unique-xids
Commit 3b389292 authored by Martin Blix Grydeland's avatar Martin Blix Grydeland
Browse files
Options

Rename variable dup -> duplicate to unbreak build (warning on global 

shadowing).
parent f6c4379a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
bin/varnishd/cache/cache_ban.c
View file @ 3b389292
...@@ -634,7 +634,7 @@ static void ...@@ -634,7 +634,7 @@ static void
ban_reload(const uint8_t *ban, unsigned len) ban_reload(const uint8_t *ban, unsigned len)
{ {
struct ban *b, *b2; struct ban *b, *b2;
int dup = 0; int duplicate = 0;
double t0, t1, t2 = 9e99; double t0, t1, t2 = 9e99;
ASSERT_CLI(); ASSERT_CLI();
...@@ -652,7 +652,7 @@ ban_reload(const uint8_t *ban, unsigned len) ...@@ -652,7 +652,7 @@ ban_reload(const uint8_t *ban, unsigned len)
if (t1 < t0) if (t1 < t0)
break; break;
if (ban_equal(b->spec, ban)) if (ban_equal(b->spec, ban))
dup = 1; duplicate = 1;
} }
VSC_C_main->bans++; VSC_C_main->bans++;
...@@ -667,9 +667,9 @@ ban_reload(const uint8_t *ban, unsigned len) ...@@ -667,9 +667,9 @@ ban_reload(const uint8_t *ban, unsigned len)
VSC_C_main->bans_req++; VSC_C_main->bans_req++;
b2->flags |= BAN_F_REQ; b2->flags |= BAN_F_REQ;
} }
if (dup) if (duplicate)
VSC_C_main->bans_dups++; VSC_C_main->bans_dups++;
if (dup || (ban[BANS_FLAGS] & BANS_FLAG_GONE)) if (duplicate || (ban[BANS_FLAGS] & BANS_FLAG_GONE))
ban_mark_gone(b2); ban_mark_gone(b2);
if (b == NULL) if (b == NULL)
VTAILQ_INSERT_TAIL(&ban_head, b2, list); VTAILQ_INSERT_TAIL(&ban_head, b2, list);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment