summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonnie Sahlberg <sahlberg@ronnie>2007-07-11 18:13:03 +1000
committerRonnie Sahlberg <sahlberg@ronnie>2007-07-11 18:13:03 +1000
commite4db03f7e61bcfcab8cdca7baf578d71bfb26c45 (patch)
treedfb2aca699b78a24c9c335c90bc70c72be03a2d3
parentaa080f66d93c40094beb06906e5f9cc69fc2c129 (diff)
downloadsamba-e4db03f7e61bcfcab8cdca7baf578d71bfb26c45.tar.gz
samba-e4db03f7e61bcfcab8cdca7baf578d71bfb26c45.tar.xz
samba-e4db03f7e61bcfcab8cdca7baf578d71bfb26c45.zip
add a ctdb_ prefix to two public functions
(This used to be ctdb commit 32adee5426aa75ddcd4d648ef326ed03d5ff5c46)
-rw-r--r--ctdb/common/system.c2
-rw-r--r--ctdb/include/ctdb_private.h4
-rw-r--r--ctdb/server/ctdb_takeover.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/ctdb/common/system.c b/ctdb/common/system.c
index c05898e267..493b07803a 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 13e3323b66..14808e0654 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 76460facbd..a2ccf50109 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;