|
 |
9cfb40 |
From a6a44b6a8f8a6af9d1cef3efaae9331e24257572 Mon Sep 17 00:00:00 2001
|
|
|
9cfb40 |
From: YAMAMOTO Masaya <pandax381@gmail.com>
|
|
|
9cfb40 |
Date: Fri, 14 Jul 2017 14:47:00 +0900
|
|
|
9cfb40 |
Subject: [PATCH 7/8] Remove unnecessary parameter compare
|
|
|
9cfb40 |
|
|
|
9cfb40 |
---
|
|
|
9cfb40 |
keepalived/check/check_dns.c | 2 --
|
|
|
9cfb40 |
keepalived/check/check_http.c | 4 ----
|
|
|
9cfb40 |
keepalived/check/check_misc.c | 6 ------
|
|
|
9cfb40 |
keepalived/check/check_smtp.c | 4 ----
|
|
|
9cfb40 |
keepalived/check/check_tcp.c | 4 ----
|
|
|
9cfb40 |
5 files changed, 20 deletions(-)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
diff --git a/keepalived/check/check_dns.c b/keepalived/check/check_dns.c
|
|
|
9cfb40 |
index 603742a4..671062bf 100644
|
|
|
9cfb40 |
--- a/keepalived/check/check_dns.c
|
|
|
9cfb40 |
+++ b/keepalived/check/check_dns.c
|
|
|
9cfb40 |
@@ -396,8 +396,6 @@ dns_check_compare(void *a, void *b)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
if (!compare_conn_opts(CHECKER_CO(a), CHECKER_CO(b)))
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
- if (old->retry != new->retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
if (strcmp(old->type, new->type) != 0)
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
if (strcmp(old->name, new->name) != 0)
|
|
|
9cfb40 |
diff --git a/keepalived/check/check_http.c b/keepalived/check/check_http.c
|
|
|
9cfb40 |
index 1ad395cf..2802d6f5 100644
|
|
|
9cfb40 |
--- a/keepalived/check/check_http.c
|
|
|
9cfb40 |
+++ b/keepalived/check/check_http.c
|
|
|
9cfb40 |
@@ -133,10 +133,6 @@ http_get_check_compare(void *a, void *b)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
if (!compare_conn_opts(CHECKER_CO(a), CHECKER_CO(b)))
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
- if (old->nb_get_retry != new->nb_get_retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
- if (old->delay_before_retry != new->delay_before_retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
if (LIST_SIZE(old->url) != LIST_SIZE(new->url))
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
for (n = 0; n < LIST_SIZE(new->url); n++) {
|
|
|
9cfb40 |
diff --git a/keepalived/check/check_misc.c b/keepalived/check/check_misc.c
|
|
|
9cfb40 |
index f1f66955..0cc649b6 100644
|
|
|
9cfb40 |
--- a/keepalived/check/check_misc.c
|
|
|
9cfb40 |
+++ b/keepalived/check/check_misc.c
|
|
|
9cfb40 |
@@ -80,12 +80,6 @@ misc_check_compare(void *a, void *b)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
if (strcmp(old->path, new->path) != 0)
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
- if (old->timeout != new->timeout)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
- if (old->dynamic != new->dynamic)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
- if (old->uid != new->uid || new->gid != new->gid)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
|
|
|
9cfb40 |
return true;
|
|
|
9cfb40 |
}
|
|
|
9cfb40 |
diff --git a/keepalived/check/check_smtp.c b/keepalived/check/check_smtp.c
|
|
|
9cfb40 |
index 44d15e01..c135258f 100644
|
|
|
9cfb40 |
--- a/keepalived/check/check_smtp.c
|
|
|
9cfb40 |
+++ b/keepalived/check/check_smtp.c
|
|
|
9cfb40 |
@@ -92,10 +92,6 @@ smtp_check_compare(void *a, void *b)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
if (strcmp(old->helo_name, new->helo_name) != 0)
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
- if (old->retry != new->retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
- if (old->db_retry != new->db_retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
if (!compare_conn_opts(CHECKER_CO(a), CHECKER_CO(b)))
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
if (LIST_SIZE(old->host) != LIST_SIZE(new->host))
|
|
|
9cfb40 |
diff --git a/keepalived/check/check_tcp.c b/keepalived/check/check_tcp.c
|
|
|
9cfb40 |
index 1858f5fc..7afed022 100644
|
|
|
9cfb40 |
--- a/keepalived/check/check_tcp.c
|
|
|
9cfb40 |
+++ b/keepalived/check/check_tcp.c
|
|
|
9cfb40 |
@@ -70,10 +70,6 @@ tcp_check_compare(void *a, void *b)
|
|
|
9cfb40 |
|
|
|
9cfb40 |
if (!compare_conn_opts(CHECKER_CO(a), CHECKER_CO(b)))
|
|
|
9cfb40 |
return false;
|
|
|
9cfb40 |
- if (old->n_retry != new->n_retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
- if (old->delay_before_retry != new->delay_before_retry)
|
|
|
9cfb40 |
- return false;
|
|
|
9cfb40 |
|
|
|
9cfb40 |
return true;
|
|
|
9cfb40 |
}
|
|
|
9cfb40 |
--
|
|
|
9cfb40 |
2.20.1
|
|
|
9cfb40 |
|