From: Mikhail Galanin <mgalanin@mimecast.com>
Date: Fri, 10 Aug 2018 12:07:53 +0000 (+0100)
Subject: [Minor] str_from_rdns_type -> rdns_str_from_type to keep consistency
X-Git-Tag: 1.8.0~281^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=refs%2Fpull%2F2412%2Fhead;p=rspamd.git

[Minor] str_from_rdns_type -> rdns_str_from_type to keep consistency
---

diff --git a/contrib/librdns/rdns.h b/contrib/librdns/rdns.h
index 4fa5a1521..8aca1f9f6 100644
--- a/contrib/librdns/rdns.h
+++ b/contrib/librdns/rdns.h
@@ -397,7 +397,7 @@ enum rdns_request_type rdns_type_fromstr (const char *str);
  * @return
  */
 const char *
-str_from_rdns_type (enum rdns_request_type rcode);
+rdns_str_from_type (enum rdns_request_type rcode);
 
 /**
  * Parse string and return error code
diff --git a/contrib/librdns/util.c b/contrib/librdns/util.c
index 11578a172..c9480beb6 100644
--- a/contrib/librdns/util.c
+++ b/contrib/librdns/util.c
@@ -290,7 +290,7 @@ rdns_type_fromstr (const char *str)
 }
 
 const char *
-str_from_rdns_type (enum rdns_request_type rcode)
+rdns_str_from_type (enum rdns_request_type rcode)
 {
 	switch (rcode) {
 		case RDNS_REQUEST_INVALID:
diff --git a/src/libserver/dns.c b/src/libserver/dns.c
index 887cbffdf..b150f5581 100644
--- a/src/libserver/dns.c
+++ b/src/libserver/dns.c
@@ -440,7 +440,7 @@ rspamd_dns_resolver_config_ucl (struct rspamd_config *cfg,
 					default:
 						msg_err_config ("invalid or unsupported reply element "
 										"for fake DNS record %s(%s): %s",
-								name, str_from_rdns_type (rtype), str_rep);
+								name, rdns_str_from_type (rtype), str_rep);
 						free (rep);
 						break;
 					}
@@ -449,7 +449,7 @@ rspamd_dns_resolver_config_ucl (struct rspamd_config *cfg,
 				ucl_object_iterate_free (rep_it);
 
 				if (replies) {
-					msg_info_config ("added fake record: %s(%s)", name, str_from_rdns_type (rtype));
+					msg_info_config ("added fake record: %s(%s)", name, rdns_str_from_type (rtype));
 					rdns_resolver_set_fake_reply (dns_resolver->r,
 							name, rtype, rcode, replies);
 				}
@@ -464,7 +464,7 @@ rspamd_dns_resolver_config_ucl (struct rspamd_config *cfg,
 
 				if (replies_obj) {
 					msg_warn_config ("replies are set for non-successful return "
-					  "code for %s(%s), they will be ignored", name, str_from_rdns_type (rtype));
+					  "code for %s(%s), they will be ignored", name, rdns_str_from_type (rtype));
 				}
 
 				rdns_resolver_set_fake_reply (dns_resolver->r,