Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
lib/ipc_posix_mq.c | 43 ++++++++++++++++++++---------------------
lib/ipc_shm.c | 49 ++++++++++++++++++++++++----------------------
lib/ipc_sysv_mq.c | 2 -
lib/ipc_us.c | 13 ++++++-----
lib/ipcs.c | 9 ++++---
lib/ringbuffer.c | 3 +-
lib/ringbuffer_helper.c | 17 +++++++--------
lib/timer.c | 13 +++++++----
lib/tsafe.c | 6 ++--
9 files changed, 79 insertions(+), 76 deletions(-)
diff --git a/lib/ipc_posix_mq.c b/lib/ipc_posix_mq.c
index 32d93d4..ed1d11e 100644
--- a/lib/ipc_posix_mq.c
+++ b/lib/ipc_posix_mq.c
@@ -26,7 +26,6 @@
#include "util_int.h"
#include <qb/qbpoll.h>
-
static ssize_t qb_ipcs_pmq_dispatch_send(struct qb_ipcs_connection *c,
void *data, size_t size);
@@ -34,10 +33,9 @@ static ssize_t qb_ipcs_pmq_dispatch_send(struct qb_ipcs_connection *c,
* utility functions
* --------------------------------------------------------
*/
-static int32_t posix_mq_increase_limits(size_t max_msg_size,
- int32_t q_len)
+static int32_t posix_mq_increase_limits(size_t max_msg_size, int32_t q_len)
{
- FILE* proc_fd;
+ FILE *proc_fd;
int32_t msgsize_max;
char size_str[10];
int32_t res = 0;
@@ -84,13 +82,13 @@ static int32_t posix_mq_increase_limits(size_t max_msg_size,
return 0;
}
-static mqd_t posix_mq_create(const char* mq_name, size_t max_msg_size,
- int32_t flags)
+static mqd_t posix_mq_create(const char *mq_name, size_t max_msg_size,
+ int32_t flags)
{
struct mq_attr attr;
mqd_t res = 0;
int32_t q_len = 10;
- mode_t m = 0600;
+ mode_t m = 0600;
attr.mq_flags = O_NONBLOCK;
attr.mq_maxmsg = q_len;
@@ -103,7 +101,7 @@ static mqd_t posix_mq_create(const char* mq_name, size_t
max_msg_size,
}
printf("%s(%s, %zd, %d) == %d\n",
- __func__, mq_name, max_msg_size, flags, res);
+ __func__, mq_name, max_msg_size, flags, res);
return res;
}
@@ -226,7 +224,7 @@ int32_t qb_ipcc_pmq_connect(struct qb_ipcc_connection * c)
posix_mq_increase_limits(c->max_msg_size, 10);
snprintf(c->u.pmq.request.name, NAME_MAX, "/%s", c->name);
c->u.pmq.request.q = mq_open(c->u.pmq.request.name,
- O_WRONLY | O_NONBLOCK);
+ O_WRONLY | O_NONBLOCK);
if (c->u.pmq.request.q == (mqd_t)-1) {
res = -errno;
perror("mq_open:REQUEST");
@@ -236,13 +234,13 @@ int32_t qb_ipcc_pmq_connect(struct qb_ipcc_connection * c)
/* Create the response message queue.
*/
res = snprintf(c->u.pmq.response.name,
- NAME_MAX, "/%s-response-%d",
- c->name, getpid());
+ NAME_MAX, "/%s-response-%d", c->name, getpid());
posix_mq_increase_limits(c->max_msg_size, 10);
c->u.pmq.response.q = posix_mq_create(c->u.pmq.response.name,
- c->max_msg_size,
- O_RDONLY | O_CREAT | O_EXCL | O_NONBLOCK);
+ c->max_msg_size,
+ O_RDONLY | O_CREAT | O_EXCL |
+ O_NONBLOCK);
if (c->u.pmq.response.q == (mqd_t)-1) {
res = -errno;
@@ -256,8 +254,9 @@ int32_t qb_ipcc_pmq_connect(struct qb_ipcc_connection * c)
posix_mq_increase_limits(c->max_msg_size, 10);
c->u.pmq.dispatch.q = posix_mq_create(c->u.pmq.dispatch.name,
- c->max_msg_size,
- O_RDONLY | O_CREAT | O_EXCL | O_NONBLOCK);
+ c->max_msg_size,
+ O_RDONLY | O_CREAT | O_EXCL |
+ O_NONBLOCK);
if (c->u.pmq.dispatch.q == (mqd_t)-1) {
res = -errno;
@@ -344,14 +343,14 @@ static int32_t qb_ipcs_pmq_connect(struct qb_ipcs_service *s,
posix_mq_increase_limits(c->service->max_msg_size, 10);
strcpy(c->u.pmq.response.name, init->response_mq);
c->u.pmq.response.q = mq_open(c->u.pmq.response.name,
- O_WRONLY | O_NONBLOCK);
+ O_WRONLY | O_NONBLOCK);
if (c->u.pmq.response.q == (mqd_t)-1) {
res = -errno;
perror("mq_open:RESPONSE");
return res;
}
qb_util_log(LOG_DEBUG, "%s:%s (fd==%d)",
- __func__, c->u.pmq.response.name, c->u.pmq.response.q);
+ __func__, c->u.pmq.response.name, c->u.pmq.response.q);
/* setup the dispatch message queue
*/
@@ -359,7 +358,7 @@ static int32_t qb_ipcs_pmq_connect(struct qb_ipcs_service *s,
strcpy(c->u.pmq.dispatch.name, init->dispatch_mq);
qb_util_log(LOG_DEBUG, "%s:%s", __func__, c->u.pmq.dispatch.name);
c->u.pmq.dispatch.q = mq_open(c->u.pmq.dispatch.name,
- O_WRONLY | O_NONBLOCK);
+ O_WRONLY | O_NONBLOCK);
if (c->u.pmq.dispatch.q == (mqd_t)-1) {
res = -errno;
@@ -430,7 +429,7 @@ static ssize_t qb_ipcs_pmq_dispatch_send(struct qb_ipcs_connection
*c,
return size;
}
-int32_t qb_ipcs_pmq_create(struct qb_ipcs_service *s)
+int32_t qb_ipcs_pmq_create(struct qb_ipcs_service * s)
{
char mq_name[NAME_MAX];
int32_t res;
@@ -445,7 +444,7 @@ int32_t qb_ipcs_pmq_create(struct qb_ipcs_service *s)
posix_mq_increase_limits(s->max_msg_size, 10);
s->u.q = posix_mq_create(mq_name, s->max_msg_size,
- (O_RDONLY | O_CREAT | O_EXCL | O_NONBLOCK));
+ (O_RDONLY | O_CREAT | O_EXCL | O_NONBLOCK));
if (s->u.q == (mqd_t)-1) {
res = -errno;
perror("posix_mq_create:REQUEST");
@@ -455,8 +454,8 @@ int32_t qb_ipcs_pmq_create(struct qb_ipcs_service *s)
if (!s->needs_sock_for_poll) {
qb_poll_dispatch_add(s->poll_handle, s->u.q,
- POLLIN | POLLPRI | POLLNVAL,
- s, qb_ipcs_dispatch_service_request);
+ POLLIN | POLLPRI | POLLNVAL,
+ s, qb_ipcs_dispatch_service_request);
}
return 0;
}
diff --git a/lib/ipc_shm.c b/lib/ipc_shm.c
index 94bfe74..bb7ffb0 100644
--- a/lib/ipc_shm.c
+++ b/lib/ipc_shm.c
@@ -25,7 +25,6 @@
#include <qb/qbpoll.h>
#include <qb/qbrb.h>
-
static ssize_t qb_ipcs_shm_dispatch_send(struct qb_ipcs_connection *c,
void *data, size_t size);
@@ -37,7 +36,7 @@ static ssize_t qb_ipcs_shm_dispatch_send(struct qb_ipcs_connection *c,
* client functions
* --------------------------------------------------------
*/
-static void qb_ipcc_shm_disconnect(struct qb_ipcc_connection* c)
+static void qb_ipcc_shm_disconnect(struct qb_ipcc_connection *c)
{
qb_rb_close(c->u.shm.request.rb);
qb_rb_close(c->u.shm.response.rb);
@@ -53,7 +52,8 @@ static int32_t qb_ipcc_shm_send(struct qb_ipcc_connection *c,
static ssize_t qb_ipcc_shm_recv(struct qb_ipcc_connection *c,
const void *msg_ptr, size_t msg_len)
{
- ssize_t res = qb_rb_chunk_read(c->u.shm.response.rb, (void*)msg_ptr, msg_len, 0);
+ ssize_t res =
+ qb_rb_chunk_read(c->u.shm.response.rb, (void *)msg_ptr, msg_len, 0);
if (res == -ETIMEDOUT) {
return -EAGAIN;
}
@@ -74,7 +74,9 @@ static int32_t _ipcc_shm_connect_to_service_(struct qb_ipcc_connection
*c)
strcpy(start.response, qb_rb_name_get(c->u.shm.response.rb));
strcpy(start.dispatch, qb_rb_name_get(c->u.shm.dispatch.rb));
- res = qb_rb_chunk_write(c->u.shm.request.rb, (const char *)&start,
start.hdr.size);
+ res =
+ qb_rb_chunk_write(c->u.shm.request.rb, (const char *)&start,
+ start.hdr.size);
if (res < 0) {
return res;
}
@@ -84,7 +86,7 @@ static int32_t _ipcc_shm_connect_to_service_(struct qb_ipcc_connection
*c)
printf("sent request to server %d\n", res);
size = qb_rb_chunk_read(c->u.shm.response.rb, c->receive_buf,
- c->max_msg_size, 100000);
+ c->max_msg_size, 100000);
if (size < 0) {
res = size;
@@ -118,7 +120,7 @@ int32_t qb_ipcc_shm_connect(struct qb_ipcc_connection * c)
/* Connect to the service's request message queue.
*/
c->u.shm.request.rb = qb_rb_open(c->name, c->max_msg_size,
- QB_RB_FLAG_SHARED_PROCESS);
+ QB_RB_FLAG_SHARED_PROCESS);
if (c->u.shm.request.rb == NULL) {
perror("qb_rb_open:REQUEST");
return -1;
@@ -127,12 +129,12 @@ int32_t qb_ipcc_shm_connect(struct qb_ipcc_connection * c)
/* Create the response message queue.
*/
res = snprintf(c->u.shm.response.name,
- NAME_MAX, "%s-response-%d",
- c->name, getpid());
+ NAME_MAX, "%s-response-%d", c->name, getpid());
c->u.shm.response.rb = qb_rb_open(c->u.shm.response.name,
- c->max_msg_size,
- QB_RB_FLAG_CREATE | QB_RB_FLAG_SHARED_PROCESS);
+ c->max_msg_size,
+ QB_RB_FLAG_CREATE |
+ QB_RB_FLAG_SHARED_PROCESS);
if (c->u.shm.response.rb == NULL) {
perror("qb_rb_open:RESPONSE");
@@ -144,8 +146,9 @@ int32_t qb_ipcc_shm_connect(struct qb_ipcc_connection * c)
c->name, getpid());
c->u.shm.dispatch.rb = qb_rb_open(c->u.shm.dispatch.name,
- c->max_msg_size,
- QB_RB_FLAG_CREATE | QB_RB_FLAG_SHARED_PROCESS);
+ c->max_msg_size,
+ QB_RB_FLAG_CREATE |
+ QB_RB_FLAG_SHARED_PROCESS);
if (c->u.shm.dispatch.rb == NULL) {
res = -errno;
@@ -171,7 +174,6 @@ cleanup_request:
return res;
}
-
/*
* service functions
* --------------------------------------------------------
@@ -234,8 +236,8 @@ static int32_t qb_ipcs_shm_connect(struct qb_ipcs_service *s,
strcpy(c->u.shm.response.name, init->response);
qb_util_log(LOG_DEBUG, "%s:%s", __func__, c->u.shm.response.name);
c->u.shm.response.rb = qb_rb_open(c->u.shm.response.name,
- s->max_msg_size,
- QB_RB_FLAG_SHARED_PROCESS);
+ s->max_msg_size,
+ QB_RB_FLAG_SHARED_PROCESS);
if (c->u.shm.response.rb == NULL) {
res = -errno;
perror("qb_rb_open:RESPONSE");
@@ -247,8 +249,8 @@ static int32_t qb_ipcs_shm_connect(struct qb_ipcs_service *s,
strcpy(c->u.shm.dispatch.name, init->dispatch);
qb_util_log(LOG_DEBUG, "%s:%s", __func__, c->u.shm.dispatch.name);
c->u.shm.dispatch.rb = qb_rb_open(c->u.shm.dispatch.name,
- s->max_msg_size,
- QB_RB_FLAG_SHARED_PROCESS);
+ s->max_msg_size,
+ QB_RB_FLAG_SHARED_PROCESS);
if (c->u.shm.dispatch.rb == NULL) {
res = -errno;
@@ -265,7 +267,7 @@ static int32_t qb_ipcs_shm_connect(struct qb_ipcs_service *s,
qb_util_log(LOG_DEBUG, "%s:sending response", __func__);
res = qb_rb_chunk_write(c->u.shm.response.rb, (const char *)&accept_msg,
- sizeof(struct mar_res_setup));
+ sizeof(struct mar_res_setup));
if (res < 0) {
res = -errno;
perror("qb_rb_chunk_write:RESPONSE");
@@ -277,7 +279,7 @@ static int32_t qb_ipcs_shm_connect(struct qb_ipcs_service *s,
cleanup_response:
accept_msg.hdr.error = res;
qb_rb_chunk_write(c->u.shm.response.rb, (const char *)&accept_msg,
- sizeof(struct mar_res_setup));
+ sizeof(struct mar_res_setup));
qb_rb_close(c->u.shm.response.rb);
return res;
@@ -296,16 +298,17 @@ static ssize_t qb_ipcs_shm_request_recv(struct qb_ipcs_service *s,
void *buf,
static ssize_t qb_ipcs_shm_response_send(struct qb_ipcs_connection *c,
void *data, size_t size)
{
- return qb_rb_chunk_write(c->u.shm.response.rb, (const char *)data, size);
+ return qb_rb_chunk_write(c->u.shm.response.rb, (const char *)data,
+ size);
}
static ssize_t qb_ipcs_shm_dispatch_send(struct qb_ipcs_connection *c,
void *data, size_t size)
{
- return qb_rb_chunk_write(c->u.shm.dispatch.rb, (const char *)data, size);
+ return qb_rb_chunk_write(c->u.shm.dispatch.rb, (const char *)data,
+ size);
}
-
int32_t qb_ipcs_shm_create(struct qb_ipcs_service *s)
{
int32_t res = 0;
@@ -317,7 +320,7 @@ int32_t qb_ipcs_shm_create(struct qb_ipcs_service *s)
s->funcs.disconnect = qb_ipcs_shm_disconnect;
s->u.rb = qb_rb_open(s->name, s->max_msg_size,
- QB_RB_FLAG_CREATE | QB_RB_FLAG_SHARED_PROCESS);
+ QB_RB_FLAG_CREATE | QB_RB_FLAG_SHARED_PROCESS);
if (s->u.rb == NULL) {
res = -errno;
perror("qb_rb_open:REQUEST");
diff --git a/lib/ipc_sysv_mq.c b/lib/ipc_sysv_mq.c
index 89eca16..9b241f8 100644
--- a/lib/ipc_sysv_mq.c
+++ b/lib/ipc_sysv_mq.c
@@ -33,7 +33,6 @@
static ssize_t qb_ipcs_smq_dispatch_send(struct qb_ipcs_connection *c,
void *data, size_t size);
-
/*
* utility functions
* --------------------------------------------------------
@@ -92,7 +91,6 @@ static key_t sysv_key_from_name(const char *name)
return ftok(key_location, 0);
}
-
/*
* client functions
* --------------------------------------------------------
diff --git a/lib/ipc_us.c b/lib/ipc_us.c
index a4924e5..f3d83d0 100644
--- a/lib/ipc_us.c
+++ b/lib/ipc_us.c
@@ -190,7 +190,7 @@ static int32_t qb_ipcs_uc_recv_and_auth(struct qb_ipcs_connection *c)
#endif
res = qb_ipc_us_recv_msghdr(c->sock, &msg_recv, setup_msg,
- sizeof(struct mar_req_initial_setup));
+ sizeof(struct mar_req_initial_setup));
if (res < 0) {
goto cleanup_and_return;
@@ -266,9 +266,9 @@ cleanup_and_return:
if (res == 0) {
res = -EACCES;
if (c->service->serv_fns.connection_authenticate &&
- c->service->serv_fns.connection_authenticate(c->handle,
- c->euid,
- c->egid)) {
+ c->service->serv_fns.connection_authenticate(c->handle,
+ c->euid,
+ c->egid)) {
res = 0;
} else if (c->service->serv_fns.connection_authenticate == NULL) {
res = 0;
@@ -557,7 +557,8 @@ retry_accept:
if (s->needs_sock_for_poll) {
qb_poll_dispatch_add(s->poll_handle, c->sock,
POLLIN | POLLPRI | POLLNVAL,
- c, qb_ipcs_dispatch_connection_request);
+ c,
+ qb_ipcs_dispatch_connection_request);
}
} else {
@@ -566,7 +567,7 @@ retry_accept:
} else {
strerror_r(-res, error_str, 100);
qb_util_log(LOG_ERR, "Error in conection setup: %s.",
- error_str);
+ error_str);
}
init_res.hdr.id = QB_IPC_MSG_AUTHENTICATE;
init_res.hdr.size = sizeof(init_res);
diff --git a/lib/ipcs.c b/lib/ipcs.c
index 1d90622..3e94007 100644
--- a/lib/ipcs.c
+++ b/lib/ipcs.c
@@ -31,7 +31,7 @@ QB_HDB_DECLARE(qb_ipc_services, qb_ipcs_destroy_internal);
QB_HDB_DECLARE(qb_ipc_connections, qb_ipcs_disconnect_internal);
qb_ipcs_service_pt qb_ipcs_create(const char *name, enum qb_ipc_type type,
- size_t max_msg_size)
+ size_t max_msg_size)
{
struct qb_ipcs_service *s;
qb_ipcs_service_pt h;
@@ -252,15 +252,16 @@ cleanup:
return res;
}
-
int32_t qb_ipcs_dispatch_service_request(qb_handle_t handle,
- int32_t fd, int32_t revents, void *data)
+ int32_t fd, int32_t revents,
+ void *data)
{
return _process_request_((struct qb_ipcs_service *)data);
}
int32_t qb_ipcs_dispatch_connection_request(qb_handle_t handle,
- int32_t fd, int32_t revents, void *data)
+ int32_t fd, int32_t revents,
+ void *data)
{
struct qb_ipcs_connection *c = (struct qb_ipcs_connection *)data;
char one_byte;
diff --git a/lib/ringbuffer.c b/lib/ringbuffer.c
index d98c532..79702fe 100644
--- a/lib/ringbuffer.c
+++ b/lib/ringbuffer.c
@@ -501,8 +501,7 @@ ssize_t qb_rb_chunk_peek(qb_ringbuffer_t * rb, void **data_out,
int32_t timeout)
rb->shared_hdr->count);
} else if (res < 0 && res != -EIDRM) {
if (res != ETIMEDOUT) {
- qb_util_log(LOG_ERR,
- "sem_timedwait %s", strerror(res));
+ qb_util_log(LOG_ERR, "sem_timedwait %s", strerror(res));
}
return res;
}
diff --git a/lib/ringbuffer_helper.c b/lib/ringbuffer_helper.c
index 88dd72c..ac35232 100644
--- a/lib/ringbuffer_helper.c
+++ b/lib/ringbuffer_helper.c
@@ -64,8 +64,8 @@ sem_wait_again:
default:
res = -errno;
qb_util_log(LOG_ERR,
- "error waiting for semaphore : %s",
- strerror(errno));
+ "error waiting for semaphore : %s",
+ strerror(errno));
break;
}
}
@@ -239,7 +239,7 @@ static int32_t my_sysv_sem_create(qb_ringbuffer_t * rb, uint32_t
flags)
if (sem_key == -1) {
res = -errno;
qb_util_log(LOG_ERR, "couldn't get a sem id %s",
- strerror(errno));
+ strerror(errno));
return res;
}
@@ -248,7 +248,7 @@ static int32_t my_sysv_sem_create(qb_ringbuffer_t * rb, uint32_t
flags)
if (rb->sem_id == -1) {
res = -errno;
qb_util_log(LOG_ERR, "couldn't create a semaphore %s",
- strerror(errno));
+ strerror(errno));
return res;
}
options.val = 0;
@@ -258,7 +258,7 @@ static int32_t my_sysv_sem_create(qb_ringbuffer_t * rb, uint32_t
flags)
if (rb->sem_id == -1) {
res = -errno;
qb_util_log(LOG_ERR, "couldn't get a sem id %s",
- strerror(errno));
+ strerror(errno));
return res;
}
res = 0;
@@ -324,8 +324,7 @@ semop_again:
goto semop_again;
}
res = -errno;
- qb_util_log(LOG_ERR, "could not lock it : %s",
- strerror(errno));
+ qb_util_log(LOG_ERR, "could not lock it : %s", strerror(errno));
return res;
}
return res;
@@ -352,7 +351,7 @@ semop_again:
}
res = -errno;
qb_util_log(LOG_ERR, "could not unlock it : %s",
- strerror(errno));
+ strerror(errno));
return res;
}
return res;
@@ -399,7 +398,7 @@ int32_t qb_rb_lock_create(struct qb_ringbuffer_s * rb, uint32_t
flags)
if (flags & QB_RB_FLAG_CREATE) {
return -pthread_spin_init(&rb->shared_hdr->spinlock,
- pshared);
+ pshared);
} else {
return 0;
}
diff --git a/lib/timer.c b/lib/timer.c
index 9d3592f..55a949e 100644
--- a/lib/timer.c
+++ b/lib/timer.c
@@ -100,7 +100,8 @@ static void sigusr1_handler(int32_t num)
}
int32_t qb_timer_init(void (*serialize_lock_fn) (void),
- void (*serialize_unlock_fn) (void), int32_t sched_priority_in)
+ void (*serialize_unlock_fn) (void),
+ int32_t sched_priority_in)
{
int32_t res;
@@ -123,8 +124,9 @@ int32_t qb_timer_init(void (*serialize_lock_fn) (void),
}
int32_t qb_timer_add_absolute(uint64_t nanosec_from_epoch,
- void *data,
- void (*timer_fn) (void *data), timer_handle * handle)
+ void *data,
+ void (*timer_fn) (void *data),
+ timer_handle * handle)
{
int32_t res;
int32_t unlock;
@@ -150,8 +152,9 @@ int32_t qb_timer_add_absolute(uint64_t nanosec_from_epoch,
}
int32_t qb_timer_add_duration(uint64_t nanosec_duration,
- void *data,
- void (*timer_fn) (void *data), timer_handle * handle)
+ void *data,
+ void (*timer_fn) (void *data),
+ timer_handle * handle)
{
int32_t res;
int32_t unlock;
diff --git a/lib/tsafe.c b/lib/tsafe.c
index 1459084..ce06bbb 100644
--- a/lib/tsafe.c
+++ b/lib/tsafe.c
@@ -394,11 +394,11 @@ int encrypt(char *block, int edflag)
void encrypt(char *block, int edflag)
#endif
{
- #ifdef QB_BSD
+#ifdef QB_BSD
static int (*real_encrypt) (char block[64], int edflag) = NULL;
- #else
+#else
static void (*real_encrypt) (char block[64], int edflag) = NULL;
- #endif
+#endif
if (!tsafe_inited || tsafe_disabled) {
if (real_encrypt == NULL) {
real_encrypt = _get_real_func_("encrypt");
--
1.7.2.2