pgpool2.git / summary / log / commit / refs
commit 924d3c507256be3ca7f728557ddca3c6ecec3f15
Author: Yugo Nagata <nagata@sraoss.co.jp>
Date: Fri Aug 02 05:39:25 2013 +0000
Remove unnecessary function prototype declarations
watchdog/watchdog.c | 5 -----
watchdog/wd_child.c | 1 -
watchdog/wd_if.c | 3 ---
watchdog/wd_init.c | 2 --
watchdog/wd_interlock.c | 10 ----------
watchdog/wd_lifecheck.c | 3 ---
watchdog/wd_list.c | 15 ---------------
watchdog/wd_packet.c | 24 ------------------------
watchdog/wd_ping.c | 4 +---
9 files changed, 1 insertion(+), 66 deletions(-)
diff --git a/watchdog/watchdog.c b/watchdog/watchdog.c
index 60bcd080c..2f817a343 100644
--- a/watchdog/watchdog.c
+++ b/watchdog/watchdog.c
@@ -47,11 +47,6 @@ static pid_t child_pid;
static pid_t hb_receiver_pid[WD_MAX_IF_NUM];
static pid_t hb_sender_pid[WD_MAX_IF_NUM];
-pid_t wd_main(int fork_wait_time);
-void wd_kill_watchdog(int sig);
-int wd_reaper_watchdog(pid_t pid, int status);
-int wd_chk_setuid(void);
-
static pid_t fork_a_lifecheck(int fork_wait_time);
static void wd_exit(int exit_status);
static int wd_check_config(void);
diff --git a/watchdog/wd_child.c b/watchdog/wd_child.c
index 0370792b6..455c5b69a 100644
--- a/watchdog/wd_child.c
+++ b/watchdog/wd_child.c
@@ -35,7 +35,6 @@
#include "pool_config.h"
#include "wd_ext.h"
-pid_t wd_child(int fork_wait_time);
static void wd_child_exit(int exit_signo);
static int wd_send_response(int sock, WdPacket * recv_pack);
static void wd_node_request_signal(WD_PACKET_NO packet_no, WdNodeInfo *node);
diff --git a/watchdog/wd_if.c b/watchdog/wd_if.c
index 9c9eaf768..dceb04fe7 100644
--- a/watchdog/wd_if.c
+++ b/watchdog/wd_if.c
@@ -37,9 +37,6 @@
#include "watchdog.h"
#include "wd_ext.h"
-int wd_IP_up(void);
-int wd_IP_down(void);
-int wd_get_cmd(char * buf, char * cmd);
static int exec_ifconfig(char * path,char * command);
int
diff --git a/watchdog/wd_init.c b/watchdog/wd_init.c
index 6bfc69e33..01264c7a1 100644
--- a/watchdog/wd_init.c
+++ b/watchdog/wd_init.c
@@ -32,8 +32,6 @@
#include "watchdog.h"
#include "wd_ext.h"
-int wd_init(void);
-
int
wd_init(void)
{
diff --git a/watchdog/wd_interlock.c b/watchdog/wd_interlock.c
index edcddb14a..bf31f4a6e 100644
--- a/watchdog/wd_interlock.c
+++ b/watchdog/wd_interlock.c
@@ -33,16 +33,6 @@
static volatile bool * WD_Locks;
-int wd_init_interlock(void);
-void wd_start_interlock(bool by_health_check);
-void wd_end_interlock(void);
-void wd_leave_interlock(void);
-void wd_wait_for_lock(WD_LOCK_ID lock_id);
-bool wd_am_I_lock_holder(void);
-bool wd_is_locked(WD_LOCK_ID lock_id);
-void wd_set_lock(WD_LOCK_ID lock_id, bool value);
-int wd_unlock(WD_LOCK_ID lock_id);
-
static void wd_update_lock_holder(void);
static int wd_assume_lock_holder(void);
static void wd_resign_lock_holder(void);
diff --git a/watchdog/wd_lifecheck.c b/watchdog/wd_lifecheck.c
index c8605f65f..4a172509a 100644
--- a/watchdog/wd_lifecheck.c
+++ b/watchdog/wd_lifecheck.c
@@ -37,9 +37,6 @@
#include "libpq-fe.h"
-int is_wd_lifecheck_ready(void);
-int wd_lifecheck(void);
-int wd_ping_pgpool(WdInfo * pgpool);
static void * thread_ping_pgpool(void * arg);
static PGconn * create_conn(char * hostname, int port);
static int pgpool_down(WdInfo * pool);
diff --git a/watchdog/wd_list.c b/watchdog/wd_list.c
index ae0938703..096b5c0b5 100644
--- a/watchdog/wd_list.c
+++ b/watchdog/wd_list.c
@@ -31,21 +31,6 @@
#include "watchdog.h"
#include "wd_ext.h"
-int wd_add_wd_list(WdDesc * other_wd);
-int wd_set_wd_info(WdInfo * info);
-WdInfo * wd_is_exist_master(void);
-WdInfo * wd_get_lock_holder(void);
-WdInfo * wd_get_interlocking(void);
-bool wd_are_interlocking_all(void);
-void wd_set_lock_holder(WdInfo *info, bool value);
-void wd_set_interlocking(WdInfo *info, bool value);
-void wd_clear_interlocking_info(void);
-int wd_am_I_oldest(void);
-int wd_set_myself(struct timeval * tv, int status);
-WdInfo * wd_is_alive_master(void);
-bool wd_is_contactable_master(void);
-bool wd_are_contactable_all(void);
-
/* add or modify watchdog information list */
int
wd_set_wd_list(char * hostname, int pgpool_port, int wd_port, char * delegate_ip, struct timeval * tv, int status)
diff --git a/watchdog/wd_packet.c b/watchdog/wd_packet.c
index 04f11e6fb..43ca0a11e 100644
--- a/watchdog/wd_packet.c
+++ b/watchdog/wd_packet.c
@@ -52,33 +52,9 @@ typedef enum {
WD_SEND_ALL_NODES
} WD_SEND_TYPE;
-int wd_startup(void);
-int wd_declare(void);
-int wd_stand_for_master(void);
-int wd_notice_server_down(void);
-int wd_update_info(void);
-int wd_authentication_failed(int sock);
-int wd_create_send_socket(char * hostname, int port);
-int wd_create_recv_socket(int port);
-int wd_accept(int sock);
-int wd_send_packet(int sock, WdPacket * snd_pack);
-int wd_recv_packet(int sock, WdPacket * buf);
-int wd_escalation(void);
-int wd_start_recovery(void);
-int wd_end_recovery(void);
-int wd_send_failback_request(int node_id);
-int wd_degenerate_backend_set(int *node_id_set, int count);
-int wd_promote_backend(int node_id);
-int wd_set_node_mask (WD_PACKET_NO packet_no, int *node_id_set, int count);
-int wd_send_packet_no(WD_PACKET_NO packet_no );
-int wd_send_lock_packet(WD_PACKET_NO packet_no, WD_LOCK_ID lock_id);
-
static int wd_send_node_packet(WD_PACKET_NO packet_no, int *node_id_set, int count);
static int wd_chk_node_mask (WD_PACKET_NO packet_no, int *node_id_set, int count);
-void wd_calc_hash(const char *str, int len, char *buf);
-int wd_packet_to_string(WdPacket pkt, char *str, int maxlen);
-
static void * wd_thread_negotiation(void * arg);
static int send_packet_for_all(WdPacket *packet);
static int send_packet_4_nodes(WdPacket *packet, WD_SEND_TYPE type);
diff --git a/watchdog/wd_ping.c b/watchdog/wd_ping.c
index 22ec3f1df..f236fed2b 100644
--- a/watchdog/wd_ping.c
+++ b/watchdog/wd_ping.c
@@ -34,9 +34,7 @@
#include "pool.h"
#include "pool_config.h"
#include "watchdog.h"
-
-int wd_is_upper_ok(char * server_list);
-int wd_is_unused_ip(char * ip);
+#include "wd_ext.h"
static void * exec_ping(void * arg);
static double get_result (char * ping_data);
[parent: c2ac6fcbc3ca]