[PATCH 10/12] build: Renamed duplicated dns_name_equal function name

Andrew Bartlett abartlet at samba.org
Tue Oct 9 15:29:14 MDT 2012


On Tue, 2012-10-09 at 22:59 +0200, Andrzej Hajda wrote:
> Signed-off-by: Andrzej Hajda <andrzej.hajda at wp.pl>
> ---
>  source4/rpc_server/dnsserver/dnsdata.c   |   18 ++++++++----------
>  source4/rpc_server/dnsserver/dnsserver.h |    2 +-
>  2 files changed, 9 insertions(+), 11 deletions(-)
> 
> diff --git a/source4/rpc_server/dnsserver/dnsdata.c b/source4/rpc_server/dnsserver/dnsdata.c
> index 3dc7dcc..9fa679c 100644
> --- a/source4/rpc_server/dnsserver/dnsdata.c
> +++ b/source4/rpc_server/dnsserver/dnsdata.c
> @@ -920,8 +920,7 @@ int dns_name_compare(const struct ldb_message **m1, const struct ldb_message **m
>  	return strcasecmp(ptr1, ptr2);
>  }
>  
> -
> -bool dns_name_equal(const char *name1, const char *name2)
> +bool dnsserver_name_equal(const char *name1, const char *name2)
>  {
>  	size_t len1 = strlen(name1);
>  	size_t len2 = strlen(name2);
> @@ -934,7 +933,6 @@ bool dns_name_equal(const char *name1, const char *name2)
>  	return strncasecmp(name1, name2, len1) == 0;
>  }
>  

> diff --git a/source4/rpc_server/dnsserver/dnsserver.h b/source4/rpc_server/dnsserver/dnsserver.h
> index e3db0b2..b3423ed 100644
> --- a/source4/rpc_server/dnsserver/dnsserver.h
> +++ b/source4/rpc_server/dnsserver/dnsserver.h
> @@ -186,7 +186,7 @@ char *dns_split_node_name(TALLOC_CTX *mem_ctx, const char *node_name, const char
>  
>  int dns_name_compare(const struct ldb_message **m1, const struct ldb_message **m2,
>  			char *search_name);
> -bool dns_name_equal(const char *name1, const char *name2);
> +bool dnsserver_name_equal(const char *name1, const char *name2);
>  bool dns_record_match(struct dnsp_DnssrvRpcRecord *rec1, struct dnsp_DnssrvRpcRecord *rec2);
>  
>  void dnsp_to_dns_copy(TALLOC_CTX *mem_ctx, struct dnsp_DnssrvRpcRecord *dnsp,

If this function is only used in this file, shouldn't it be const?

However, I think the correct thing to do here is to use the one in
dns_utils.c.  I'll defer to the DNS maintainers however. 

Andrew Bartlett


-- 
Andrew Bartlett                                http://samba.org/~abartlet/
Authentication Developer, Samba Team           http://samba.org




More information about the samba-technical mailing list