summaryrefslogtreecommitdiff
path: root/source/include/proto.h
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2008-12-03 10:37:03 -0800
committerKarolin Seeger <kseeger@samba.org>2008-12-11 10:27:14 +0100
commit29f2a6fd8aa91d585e96171475c6a44893e5d54b (patch)
tree559194cdf1435df2cb914839ef3e108491b4d0ac /source/include/proto.h
parentc0d3da886f05eca189192a1d18909371e724efc4 (diff)
downloadsamba-29f2a6fd8aa91d585e96171475c6a44893e5d54b.tar.gz
Change sockaddr util function names for consistency and to eliminate name conflicts
(cherry picked from commit f2a3617778cab1695a09f065840907e1227b6d86)
Diffstat (limited to 'source/include/proto.h')
-rw-r--r--source/include/proto.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/include/proto.h b/source/include/proto.h
index 99e9d762f1d..06130c48549 100644
--- a/source/include/proto.h
+++ b/source/include/proto.h
@@ -1538,14 +1538,14 @@ bool is_loopback_addr(const struct sockaddr_storage *pss);
bool is_zero_ip_v4(struct in_addr ip);
bool is_zero_addr(const struct sockaddr_storage *pss);
void zero_ip_v4(struct in_addr *ip);
-void zero_addr(struct sockaddr_storage *pss);
+void zero_sockaddr(struct sockaddr_storage *pss);
bool same_net_v4(struct in_addr ip1,struct in_addr ip2,struct in_addr mask);
void in_addr_to_sockaddr_storage(struct sockaddr_storage *ss,
struct in_addr ip);
bool same_net(const struct sockaddr_storage *ip1,
const struct sockaddr_storage *ip2,
const struct sockaddr_storage *mask);
-bool addr_equal(const struct sockaddr_storage *ip1,
+bool sockaddr_equal(const struct sockaddr_storage *ip1,
const struct sockaddr_storage *ip2);
bool is_address_any(const struct sockaddr_storage *psa);
uint16_t get_sockaddr_port(const struct sockaddr_storage *pss);