Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qbipcs.h | 12 ++++++------
lib/ipc_int.h | 2 +-
lib/ipcs.c | 4 ++--
tests/bms.c | 8 ++++----
tests/check_ipc.c | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/include/qb/qbipcs.h b/include/qb/qbipcs.h
index 5e5a7b5..c5d791c 100644
--- a/include/qb/qbipcs.h
+++ b/include/qb/qbipcs.h
@@ -33,7 +33,7 @@ extern "C" {
#endif
/* *INDENT-ON* */
-typedef qb_handle_t qb_ipcs_connection_pt;
+typedef qb_handle_t qb_ipcs_connection_handle_t;
typedef qb_handle_t qb_ipcs_service_pt;
typedef int32_t (*qb_ipcs_dispatch_fn_t) (qb_ipcs_service_pt s, int32_t fd, int32_t
revents,
@@ -49,10 +49,10 @@ struct qb_ipcs_poll_handlers {
qb_ipcs_dispatch_rm_fn dispatch_rm;
};
-typedef int32_t (*qb_ipcs_connection_authenticate_fn) (qb_ipcs_connection_pt c, uid_t
uid, gid_t gid);
-typedef void (*qb_ipcs_connection_created_fn) (qb_ipcs_connection_pt c);
-typedef void (*qb_ipcs_connection_destroyed_fn) (qb_ipcs_connection_pt c);
-typedef void (*qb_ipcs_msg_process_fn) (qb_ipcs_connection_pt c,
+typedef int32_t (*qb_ipcs_connection_authenticate_fn) (qb_ipcs_connection_handle_t c,
uid_t uid, gid_t gid);
+typedef void (*qb_ipcs_connection_created_fn) (qb_ipcs_connection_handle_t c);
+typedef void (*qb_ipcs_connection_destroyed_fn) (qb_ipcs_connection_handle_t c);
+typedef void (*qb_ipcs_msg_process_fn) (qb_ipcs_connection_handle_t c,
void *data, size_t size);
struct qb_ipcs_service_handlers {
@@ -76,7 +76,7 @@ int32_t qb_ipcs_run(qb_ipcs_service_pt s, qb_handle_t poll);
void qb_ipcs_destroy(qb_ipcs_service_pt s);
-ssize_t qb_ipcs_response_send(qb_ipcs_connection_pt c, void *data, size_t size);
+ssize_t qb_ipcs_response_send(qb_ipcs_connection_handle_t c, void *data, size_t size);
/* *INDENT-OFF* */
#ifdef __cplusplus
diff --git a/lib/ipc_int.h b/lib/ipc_int.h
index c1e50ca..7e30631 100644
--- a/lib/ipc_int.h
+++ b/lib/ipc_int.h
@@ -158,7 +158,7 @@ struct qb_ipcs_service {
};
struct qb_ipcs_connection {
- qb_ipcs_connection_pt handle;
+ qb_ipcs_connection_handle_t handle;
pid_t pid;
uid_t euid;
gid_t egid;
diff --git a/lib/ipcs.c b/lib/ipcs.c
index a7db325..81bf60a 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -148,7 +148,7 @@ static void qb_ipcs_destroy_internal(void *data)
free(s->receive_buf);
}
-ssize_t qb_ipcs_response_send(qb_ipcs_connection_pt c, void *data, size_t size)
+ssize_t qb_ipcs_response_send(qb_ipcs_connection_handle_t c, void *data, size_t size)
{
ssize_t res;
struct qb_ipcs_connection *con;
@@ -165,7 +165,7 @@ ssize_t qb_ipcs_response_send(qb_ipcs_connection_pt c, void *data,
size_t size)
struct qb_ipcs_connection *qb_ipcs_connection_alloc(struct qb_ipcs_service *s)
{
- qb_ipcs_connection_pt h;
+ qb_ipcs_connection_handle_t h;
struct qb_ipcs_connection *c;
qb_hdb_handle_create(&qb_ipc_connections,
diff --git a/tests/bms.c b/tests/bms.c
index 2ccc84c..b95868e 100644
--- a/tests/bms.c
+++ b/tests/bms.c
@@ -52,7 +52,7 @@ int32_t verbose = 0;
static qb_handle_t bms_poll_handle;
static qb_ipcs_service_pt s1;
-static int32_t s1_connection_authenticate_fn(qb_ipcs_connection_pt conn, uid_t uid, gid_t
gid)
+static int32_t s1_connection_authenticate_fn(qb_ipcs_connection_handle_t conn, uid_t uid,
gid_t gid)
{
if (uid == 0 && gid == 0) {
if (verbose) {
@@ -66,20 +66,20 @@ static int32_t s1_connection_authenticate_fn(qb_ipcs_connection_pt
conn, uid_t u
}
-static void s1_connection_created_fn(qb_ipcs_connection_pt conn)
+static void s1_connection_created_fn(qb_ipcs_connection_handle_t conn)
{
if (verbose) {
printf("%s:%d %s\n", __FILE__, __LINE__, __func__);
}
}
-static void s1_connection_destroyed_fn(qb_ipcs_connection_pt conn)
+static void s1_connection_destroyed_fn(qb_ipcs_connection_handle_t conn)
{
if (verbose) {
printf("%s:%d %s\n", __FILE__, __LINE__, __func__);
}
}
-static void s1_msg_process_fn(qb_ipcs_connection_pt conn,
+static void s1_msg_process_fn(qb_ipcs_connection_handle_t conn,
void *data, size_t size)
{
struct qb_ipc_request_header *req_pt = (struct qb_ipc_request_header *)data;
diff --git a/tests/check_ipc.c b/tests/check_ipc.c
index 2965104..51fcd12 100644
--- a/tests/check_ipc.c
+++ b/tests/check_ipc.c
@@ -67,7 +67,7 @@ static void sigterm_handler(int32_t num)
exit(0);
}
-static void s1_msg_process_fn(qb_ipcs_connection_pt c,
+static void s1_msg_process_fn(qb_ipcs_connection_handle_t c,
void *data, size_t size)
{
//struct qb_ipc_request_header *req_pt = (struct qb_ipc_request_header *)data;
--
1.7.2.3