1
0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00

cleanup: dmeventd code simplified

Improve readbility of code.
This commit is contained in:
Zdenek Kabelac 2014-03-10 09:44:26 +01:00
parent 341055ddb3
commit 7b17dfed69

View File

@ -466,7 +466,7 @@ static int _get_status(struct message_data *message_data)
int i, j;
int ret = -1;
int count = dm_list_size(&_thread_registry);
int size = 0, current = 0;
int size = 0, current;
char *buffers[count];
char *message;
@ -510,8 +510,8 @@ static int _get_status(struct message_data *message_data)
out:
for (j = 0; j < i; ++j)
dm_free(buffers[j]);
return ret;
return ret;
}
static int _get_parameters(struct message_data *message_data) {
@ -818,7 +818,7 @@ static struct dm_task *_get_device_status(struct thread_status *ts)
static void *_monitor_thread(void *arg)
{
struct thread_status *thread = arg;
int wait_error = 0;
int wait_error;
struct dm_task *task;
pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
@ -1413,9 +1413,10 @@ static int _client_read(struct dm_event_fifos *fifos,
dm_free(msg->data);
msg->data = NULL;
msg->size = 0;
return 0;
}
return bytes == size;
return 1;
}
/*
@ -1528,7 +1529,7 @@ static int _do_process_request(struct dm_event_daemon_message *msg)
/* Only one caller at a time. */
static void _process_request(struct dm_event_fifos *fifos)
{
int die = 0;
int die;
struct dm_event_daemon_message msg = { 0 };
/*
@ -1538,8 +1539,7 @@ static void _process_request(struct dm_event_fifos *fifos)
if (!_client_read(fifos, &msg))
return;
if (msg.cmd == DM_EVENT_CMD_DIE)
die = 1;
die = (msg.cmd == DM_EVENT_CMD_DIE) ? 1 : 0;
/* _do_process_request fills in msg (if memory allows for
data, otherwise just cmd and size = 0) */