[libqb] [PATCH 1/3] ipc: remove uneccessary version compatibilty code

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 include/qb/qbipcs.h |   32 +--------------------------
 lib/ipcs.c          |   60 +++++++-------------------------------------------
 2 files changed, 10 insertions(+), 82 deletions(-)

diff --git a/include/qb/qbipcs.h b/include/qb/qbipcs.h
index 55b6237..1d7ab32 100644
--- a/include/qb/qbipcs.h
+++ b/include/qb/qbipcs.h
@@ -54,33 +54,6 @@ struct qb_ipcs_init_state {
 	const struct sched_param *sched_param;
 	void *(*malloc) (size_t size);
 	void (*free) (void *ptr);
-        void (*log_printf) (
-                const char *format,
-                ...) __attribute__((format(printf, 1, 2)));
-	int (*service_available)(unsigned int service);
-	int (*private_data_size_get)(unsigned int service);
-	int (*security_valid)(int uid, int gid);
-	void (*serialize_lock)(void);
-	void (*serialize_unlock)(void);
-	int (*sending_allowed)(unsigned int service, unsigned int id,
-		const void *msg, void *sending_allowed_private_data);
-	void (*sending_allowed_release)(void *sending_allowed_private_data);
-	void (*poll_accept_add)(int fd);
-	void (*poll_dispatch_add)(int fd, void *context);
-	void (*poll_dispatch_modify)(int fd, int events);
-	void (*poll_dispatch_destroy)(int fd, void *context);
-	void (*fatal_error)(const char *error_msg);
-	qb_ipcs_init_fn_lvalue (*init_fn_get)(unsigned int service);
-	qb_ipcs_exit_fn_lvalue (*exit_fn_get)(unsigned int service);
-	qb_ipcs_handler_fn_lvalue (*handler_fn_get)(unsigned int service, unsigned int id);
-};
-
-struct qb_ipcs_init_state_v2 {
-	const char *socket_name;
-	int sched_policy;
-	const struct sched_param *sched_param;
-	void *(*malloc) (size_t size);
-	void (*free) (void *ptr);
         void (*old_log_printf) (
                 const char *format,
                 ...) __attribute__((format(printf, 1, 2)));
@@ -119,10 +92,7 @@ struct qb_ipcs_init_state_v2 {
 };
 
 extern void qb_ipcs_ipc_init (
-	struct qb_ipcs_init_state *init_state);
-
-extern void qb_ipcs_ipc_init_v2 (
-        struct qb_ipcs_init_state_v2 *init_state_v2);
+        struct qb_ipcs_init_state *init_state);
 
 extern void *qb_ipcs_private_data_get (void *conn);
 
diff --git a/lib/ipcs.c b/lib/ipcs.c
index 7a69047..70ee812 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -70,7 +70,7 @@
 #define MSG_SEND_LOCKED		0
 #define MSG_SEND_UNLOCKED	1
 
-static struct qb_ipcs_init_state_v2 *api = NULL;
+static struct qb_ipcs_init_state *api = NULL;
 
 QB_DECLARE_LIST_INIT (conn_info_qb_list_head);
 
@@ -154,8 +154,6 @@ static void ipc_disconnect (struct conn_info *conn_info);
 static void msg_send (void *conn, const struct iovec *iov, unsigned int iov_len,
 		      int locked);
 
-static void _qb_ipc_init(void);
-
 #define log_printf(level, format, args...) \
 do { \
         api->log_printf ( level, \
@@ -667,7 +665,7 @@ retry_semop:
 			qb_ipcs_response_send (conn_info,
 				&qb_ipc_response_header,
 				sizeof (qb_ipc_response_header_t));
-		} else 
+		} else
 		if (send_ok) {
 			api->serialize_lock();
 			api->stats_increment_value (conn_info->stats_handle, "requests");
@@ -905,59 +903,19 @@ static int conn_info_create (int fd)
 /*
  * Exported functions
  */
-extern void qb_ipcs_ipc_init_v2 (
-	struct qb_ipcs_init_state_v2 *init_state_v2)
-{
-	api = init_state_v2;
-	api->old_log_printf	= NULL;
-
-	log_printf (LOG_DEBUG, "you are using ipc api v2\n");
-	_qb_ipc_init ();
-}
-
 extern void qb_ipcs_ipc_init (
-        struct qb_ipcs_init_state *init_state)
+	struct qb_ipcs_init_state *init_state)
 {
-	api = calloc (sizeof(struct qb_ipcs_init_state_v2), 1);
-	/* v2 api */
+	int server_fd;
+	struct sockaddr_un un_addr;
+	int res;
+
+	api = init_state;
+	api->old_log_printf	= NULL;
 	api->stats_create_connection	= dummy_stats_create_connection;
 	api->stats_destroy_connection	= dummy_stats_destroy_connection;
 	api->stats_update_value		= dummy_stats_update_value;
 	api->stats_increment_value	= dummy_stats_increment_value;
-	api->log_printf			= NULL;
-
-	/* v1 api */
-	api->socket_name		= init_state->socket_name;
-	api->sched_policy		= init_state->sched_policy;
-	api->sched_param		= init_state->sched_param;
-	api->malloc			= init_state->malloc;
-	api->free			= init_state->free;
-	api->old_log_printf		= init_state->log_printf;
-	api->fatal_error		= init_state->fatal_error;
-	api->security_valid		= init_state->security_valid;
-	api->service_available		= init_state->service_available;
-	api->private_data_size_get	= init_state->private_data_size_get;
-	api->serialize_lock		= init_state->serialize_lock;
-	api->serialize_unlock		= init_state->serialize_unlock;
-	api->sending_allowed		= init_state->sending_allowed;
-	api->sending_allowed_release	= init_state->sending_allowed_release;
-	api->poll_accept_add		= init_state->poll_accept_add;
-	api->poll_dispatch_add		= init_state->poll_dispatch_add;
-	api->poll_dispatch_modify	= init_state->poll_dispatch_modify;
-	api->init_fn_get		= init_state->init_fn_get;
-	api->exit_fn_get		= init_state->exit_fn_get;
-	api->handler_fn_get		= init_state->handler_fn_get;
-
-	log_printf (LOG_DEBUG, "you are using ipc api v1\n");
-
-	_qb_ipc_init ();
-}
-
-static void _qb_ipc_init(void)
-{
-	int server_fd;
-	struct sockaddr_un un_addr;
-	int res;
 
 	/*
 	 * Create socket for IPC clients, name socket, listen for connections
-- 
1.6.6.1