shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

dmeventd: simplify error path

Browse Source 
Use common 'bad:' label for exit error path where
fifo is closed before exit().
This commit is contained in:
Zdenek Kabelac 2013-11-25 14:24:25 +01:00
parent 6dae237303
commit b3679590df
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW_DM
View File

@ -1,5 +1,6 @@
Version 1.02.84 -
====================================
Close fifos before exiting in dmeventd restart() error path.
Move printf format string directly into dm_asprintf args list.
Catch invalid use of string sort values when reporting numerical fields.

21
daemons/dmeventd/dmeventd.c
View File

@ -1848,20 +1848,18 @@ static void restart(void)
if (!dm_event_get_version(&fifos, &version)) {
fprintf(stderr, "WARNING: Could not communicate with existing dmeventd.\n");
fini_fifos(&fifos);
exit(EXIT_FAILURE);
goto bad;
}
if (version < 1) {
fprintf(stderr, "WARNING: The running dmeventd instance is too old.\n"
"Protocol version %d (required: 1). Action cancelled.\n",
version);
exit(EXIT_FAILURE);
goto bad;
}
if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_GET_STATUS, "-", "-", 0, 0)) {
exit(EXIT_FAILURE);
}
if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_GET_STATUS, "-", "-", 0, 0))
goto bad;
message = msg.data;
message = strchr(message, ' ');
@ -1876,13 +1874,13 @@ static void restart(void)
if (!(_initial_registrations = dm_malloc(sizeof(char*) * (count + 1)))) {
fprintf(stderr, "Memory allocation registration failed.\n");
exit(EXIT_FAILURE);
goto bad;
}
for (i = 0; i < count; ++i) {
if (!(_initial_registrations[i] = dm_strdup(message))) {
fprintf(stderr, "Memory allocation for message failed.\n");
exit(EXIT_FAILURE);
goto bad;
}
message += strlen(message) + 1;
}
@ -1890,7 +1888,7 @@ static void restart(void)
if (daemon_talk(&fifos, &msg, DM_EVENT_CMD_DIE, "-", "-", 0, 0)) {
fprintf(stderr, "Old dmeventd refused to die.\n");
exit(EXIT_FAILURE);
goto bad;
}
/*
@ -1904,6 +1902,11 @@ static void restart(void)
}
fini_fifos(&fifos);
return;
bad:
fini_fifos(&fifos);
exit(EXIT_FAILURE);
}
static void usage(char *prog, FILE *file)