From 33099da3b7c8de7d8f3a3e201bcf119480dfac12 Mon Sep 17 00:00:00 2001
From: vemax78 <devnull@localhost>
Date: Sun, 24 Nov 2013 17:09:07 +0100
Subject: [PATCH] Rename message queue functions

---
 src/ac/ac.c              | 4 ++--
 src/ac/ac_execute.c      | 6 +++---
 src/ac/ac_session.c      | 2 +-
 src/ac/ac_session.h      | 6 +++---
 src/ac/ac_session_data.c | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/ac/ac.c b/src/ac/ac.c
index d696456..530ab7b 100644
--- a/src/ac/ac.c
+++ b/src/ac/ac.c
@@ -22,7 +22,7 @@ static int ac_init(void) {
 	g_ac.standalone = 1;
 
 	/* Sessions message queue */
-	if (!ac_session_msgqueue_init()) {
+	if (!ac_msgqueue_init()) {
 		return 0;
 	}
 
@@ -106,7 +106,7 @@ static void ac_destroy(void) {
 	capwap_list_free(g_ac.sessionsdata);
 	capwap_list_free(g_ac.sessionsthread);
 	capwap_rwlock_destroy(&g_ac.sessionslock);
-	ac_session_msgqueue_free();
+	ac_msgqueue_free();
 
 	/* Backend */
 	if (g_ac.backendacid) {
diff --git a/src/ac/ac_execute.c b/src/ac/ac_execute.c
index 00fffa0..b543d63 100644
--- a/src/ac/ac_execute.c
+++ b/src/ac/ac_execute.c
@@ -75,7 +75,7 @@ static void ac_wait_terminate_allsessions(void) {
 }
 
 /* Initialize message queue */
-int ac_session_msgqueue_init(void) {
+int ac_msgqueue_init(void) {
 	if (socketpair(AF_LOCAL, SOCK_DGRAM, 0, g_ac.fdmsgsessions)) {
 		return 0;
 	}
@@ -84,13 +84,13 @@ int ac_session_msgqueue_init(void) {
 }
 
 /* Free sessions message queue */
-void ac_session_msgqueue_free(void) {
+void ac_msgqueue_free(void) {
 	close(g_ac.fdmsgsessions[1]);
 	close(g_ac.fdmsgsessions[0]);
 }
 
 /* */
-void ac_session_msgqueue_notify_closethread(pthread_t threadid) {
+void ac_msgqueue_notify_closethread(pthread_t threadid) {
 	struct ac_session_msgqueue_item_t item;
 
 	/* Send message */
diff --git a/src/ac/ac_session.c b/src/ac/ac_session.c
index 98ba608..30241fa 100644
--- a/src/ac/ac_session.c
+++ b/src/ac/ac_session.c
@@ -523,7 +523,7 @@ void* ac_session_thread(void* param) {
 	capwap_logging_debug("Session end");
 
 	/* Notify terminate thread */
-	ac_session_msgqueue_notify_closethread(threadid);
+	ac_msgqueue_notify_closethread(threadid);
 
 	/* Thread exit */
 	pthread_exit(NULL);
diff --git a/src/ac/ac_session.h b/src/ac/ac_session.h
index 0aef48f..a314ae5 100644
--- a/src/ac/ac_session.h
+++ b/src/ac/ac_session.h
@@ -137,9 +137,9 @@ void ac_free_reference_last_request(struct ac_session_t* session);
 void ac_free_reference_last_response(struct ac_session_t* session);
 
 /* */
-int ac_session_msgqueue_init(void);
-void ac_session_msgqueue_free(void);
-void ac_session_msgqueue_notify_closethread(pthread_t threadid);
+int ac_msgqueue_init(void);
+void ac_msgqueue_free(void);
+void ac_msgqueue_notify_closethread(pthread_t threadid);
 
 /* */
 int ac_dtls_setup(struct ac_session_t* session);
diff --git a/src/ac/ac_session_data.c b/src/ac/ac_session_data.c
index 58c8a09..a39f5b7 100644
--- a/src/ac/ac_session_data.c
+++ b/src/ac/ac_session_data.c
@@ -399,7 +399,7 @@ void* ac_session_data_thread(void* param) {
 	capwap_logging_debug("Session data end");
 
 	/* Notify terminate thread */
-	ac_session_msgqueue_notify_closethread(threadid);
+	ac_msgqueue_notify_closethread(threadid);
 
 	/* Thread exit */
 	pthread_exit(NULL);