shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-19 14:04:17 +03:00
Code Releases Activity

cleanup: dmeventd drop setting of size

Browse Source 
Size is not used when msg->data is NULL.
This commit is contained in:
Zdenek Kabelac 2014-04-18 15:12:59 +02:00
parent 78c6dea48e
commit 1f701c7bf6
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
daemons/dmeventd/dmeventd.c
View File

@ -382,7 +382,6 @@ static int _parse_message(struct message_data *message_data)
dm_free(msg->data); dm_free(msg->data);
msg->data = NULL; msg->data = NULL;
msg->size = 0;
return ret; return ret;
} }
@ -1128,10 +1127,8 @@ static int _registered_device(struct message_data *message_data,
if ((r = dm_asprintf(&(msg->data), "%s %s %s %u", if ((r = dm_asprintf(&(msg->data), "%s %s %s %u",
message_data->id, message_data->id,
thread->dso_data->dso_name, thread->dso_data->dso_name,
thread->device.uuid, events)) < 0) { thread->device.uuid, events)) < 0)
msg->size = 0;
return -ENOMEM; return -ENOMEM;
}
msg->size = (uint32_t) r; msg->size = (uint32_t) r;
@ -1242,10 +1239,9 @@ static int _get_timeout(struct message_data *message_data)
if ((thread = _lookup_thread_status(message_data))) { if ((thread = _lookup_thread_status(message_data))) {
msg->size = dm_asprintf(&(msg->data), "%s %" PRIu32, msg->size = dm_asprintf(&(msg->data), "%s %" PRIu32,
message_data->id, thread->timeout); message_data->id, thread->timeout);
} else { } else
msg->data = NULL; msg->data = NULL;
msg->size = 0;
}
_unlock_mutex(); _unlock_mutex();
return thread ? 0 : -ENODEV; return thread ? 0 : -ENODEV;
@ -1384,7 +1380,6 @@ static int _client_read(struct dm_event_fifos *fifos,
if (bytes != size) { if (bytes != size) {
dm_free(msg->data); dm_free(msg->data);
msg->data = NULL; msg->data = NULL;
msg->size = 0;
return 0; return 0;
} }
@ -1491,11 +1486,10 @@ static int _do_process_request(struct dm_event_daemon_message *msg)
answer = msg->data; answer = msg->data;
if (answer) { if (answer) {
msg->size = dm_asprintf(&(msg->data), "%s %s %d", answer, msg->size = dm_asprintf(&(msg->data), "%s %s %d", answer,
msg->cmd == DM_EVENT_CMD_DIE ? "DYING" : "HELLO", (msg->cmd == DM_EVENT_CMD_DIE) ? "DYING" : "HELLO",
DM_EVENT_PROTOCOL_VERSION); DM_EVENT_PROTOCOL_VERSION);
dm_free(answer); dm_free(answer);
} else }
msg->size = 0;
} else if (msg->cmd != DM_EVENT_CMD_ACTIVE && !_parse_message(&message_data)) { } else if (msg->cmd != DM_EVENT_CMD_ACTIVE && !_parse_message(&message_data)) {
stack; stack;
ret = -EINVAL; ret = -EINVAL;