Refactor: some more cleanups (unused or shall-be-static functions)

Signed-off-by: Jan Pokorný <[email protected]>
ClusterLabs · Jan 30, 2020 · 47034dc · 47034dc
1 parent 2246488
commit 47034dc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/src/request.c b/src/request.c
@@ -50,6 +50,7 @@ void *add_req(
 	return rp;
 }
 
+/* XXX UNUSED */
 int get_req_id(const void *rp)
 {
 	if (!rp)

diff --git a/src/request.h b/src/request.h
@@ -62,6 +62,8 @@ void *add_req(struct ticket_config *tk, struct client *req_client,
  */
 void foreach_tkt_req(struct booth_config *conf_ptr, struct ticket_config *tk,
                      req_fp f);
+
+/* XXX UNUSED */
 int get_req_id(const void *rp);
 
 #endif /* _REQUEST_H */
diff --git a/src/ticket.c b/src/ticket.c
@@ -545,6 +545,7 @@ void disown_ticket(struct ticket_config *tk)
 	get_time(&tk->term_expires);
 }
 
+/* XXX UNUSED */
 int disown_if_expired(struct ticket_config *tk)
 {
 	if (is_past(&tk->term_expires) ||
@@ -985,7 +986,7 @@ static void handle_resends(struct booth_config *conf_ptr,
 	resend_msg(conf_ptr, tk);
 }
 
-int postpone_ticket_processing(struct ticket_config *tk)
+static int postpone_ticket_processing(struct ticket_config *tk)
 {
 	extern timetype start_time;
 

diff --git a/src/ticket.h b/src/ticket.h
@@ -95,6 +95,8 @@ extern int TIME_RES;
 
 void save_committed_tkt(struct ticket_config *tk);
 void disown_ticket(struct ticket_config *tk);
+
+/* XXX UNUSED */
 int disown_if_expired(struct ticket_config *tk);
 
 /**
@@ -125,9 +127,6 @@ int check_ticket(struct booth_config *conf_ptr, const char *ticket,
 int check_site(struct booth_config *conf_ptr, const char *site,
                int *local);
 
-int grant_ticket(struct ticket_config *ticket);
-int revoke_ticket(struct ticket_config *ticket);
-
 /**
  * @internal
  * Second stage of incoming datagram handling (after authentication)
@@ -181,7 +180,6 @@ int find_ticket_by_name(struct booth_config *conf_ptr,
                         const char *ticket, struct ticket_config **found);
 
 void set_ticket_wakeup(struct ticket_config *tk);
-int postpone_ticket_processing(struct ticket_config *tk);
 
 /**
  * @internal

diff --git a/src/transport.c b/src/transport.c
@@ -372,9 +372,8 @@ static int do_write(int fd, void *buf, size_t count)
 	return 0;
 }
 
-
 /* Only used for client requests (tcp) */
-int read_client(struct client *req_cl)
+static int read_client(struct client *req_cl)
 {
 	char *msg;
 	struct boothc_header *header;
@@ -424,7 +423,6 @@ int read_client(struct client *req_cl)
 	return 0;
 }
 
-
 /* Only used for client requests (tcp) */
 static void process_connection(struct booth_config *conf_ptr, int ci)
 {

diff --git a/src/transport.h b/src/transport.h
@@ -72,7 +72,6 @@ typedef struct booth_transport booth_transport_table_t[TRANSPORT_ENTRIES];
 int find_myself(struct booth_config *conf_ptr, struct booth_site **mep,
                 int fuzzy_allowed);
 
-int read_client(struct client *req_cl);
 int check_boothc_header(struct boothc_header *data, int len_incl_data);
 
 int setup_tcp_listener(int test_only);