From: Ronnie Sahlberg <sahlberg@ronnie>
Date: Wed, 11 Jul 2007 08:13:03 +0000 (+1000)
Subject: add a ctdb_ prefix to two public functions
X-Git-Tag: tevent-0.9.20~348^2~2452^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4db03f7e61bcfcab8cdca7baf578d71bfb26c45;p=thirdparty%2Fsamba.git

add a ctdb_ prefix to two public functions

(This used to be ctdb commit 32adee5426aa75ddcd4d648ef326ed03d5ff5c46)
---

diff --git a/ctdb/common/system.c b/ctdb/common/system.c
index c05898e267e..493b07803a7 100644
--- a/ctdb/common/system.c
+++ b/ctdb/common/system.c
@@ -402,7 +402,7 @@ int ctdb_sys_open_capture_socket(void)
 	return s;
 }
 
-int sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp)
+int ctdb_sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp)
 {
 	int ret;
 #define RCVPKTSIZE 100
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index 13e3323b66e..14808e06549 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -1055,7 +1055,7 @@ struct ctdb_kill_tcp {
 	struct ctdb_killtcp_connection *connections;
 };
 int ctdb_sys_open_capture_socket(void);
-int killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *src, struct sockaddr_in *dst);
-int sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp);
+int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *src, struct sockaddr_in *dst);
+int ctdb_sys_read_tcp_packet(struct ctdb_kill_tcp *killtcp);
 
 #endif
diff --git a/ctdb/server/ctdb_takeover.c b/ctdb/server/ctdb_takeover.c
index 76460facbdd..a2ccf501097 100644
--- a/ctdb/server/ctdb_takeover.c
+++ b/ctdb/server/ctdb_takeover.c
@@ -829,7 +829,7 @@ static void capture_tcp_handler(struct event_context *ev, struct fd_event *fde,
 	struct ctdb_kill_tcp *killtcp = talloc_get_type(private_data, struct ctdb_kill_tcp);
 
 	if (flags & EVENT_FD_READ) {
-		sys_read_tcp_packet(killtcp);
+		ctdb_sys_read_tcp_packet(killtcp);
 	}
 }
 
@@ -891,7 +891,7 @@ static int ctdb_killtcp_connection_destructor(struct ctdb_killtcp_connection *co
 	return 0;
 }
 
-int killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *src, struct sockaddr_in *dst)
+int ctdb_killtcp_add_connection(struct ctdb_context *ctdb, struct sockaddr_in *src, struct sockaddr_in *dst)
 {
 	struct ctdb_kill_tcp *killtcp=ctdb->killtcp;;
 	struct ctdb_killtcp_connection *conn;