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

dmeventd: simplify fifos init

Browse Source 
Simplier code.
This commit is contained in:
Zdenek Kabelac 2013-09-05 13:14:19 +02:00
parent b33b618fc8
commit a94e28ae01
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
daemons/dmeventd/dmeventd.c
View File

@ -1247,16 +1247,6 @@ static int _get_timeout(struct message_data *message_data)
return thread ? 0 : -ENODEV; return thread ? 0 : -ENODEV;
} }
/* Initialize a fifos structure with path names. */
static void _init_fifos(struct dm_event_fifos *fifos)
{
fifos->client = -1;
fifos->server = -1;
fifos->client_path = DM_EVENT_FIFO_CLIENT;
fifos->server_path = DM_EVENT_FIFO_SERVER;
}
/* Open fifos used for client communication. */ /* Open fifos used for client communication. */
static int _open_fifos(struct dm_event_fifos *fifos) static int _open_fifos(struct dm_event_fifos *fifos)
{ {
@ -1706,8 +1696,6 @@ static int _systemd_handover(struct dm_event_fifos *fifos)
unsigned long env_pid, env_listen_fds; unsigned long env_pid, env_listen_fds;
int r = 0; int r = 0;
memset(fifos, 0, sizeof(*fifos));
/* SD_ACTIVATION must be set! */ /* SD_ACTIVATION must be set! */
if (!(e = getenv(SD_ACTIVATION_ENV_VAR_NAME)) || strcmp(e, "1")) if (!(e = getenv(SD_ACTIVATION_ENV_VAR_NAME)) || strcmp(e, "1"))
goto out; goto out;
@ -1929,7 +1917,12 @@ static void usage(char *prog, FILE *file)
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
signed char opt; signed char opt;
struct dm_event_fifos fifos; struct dm_event_fifos fifos = {
.client = -1,
.server = -1,
.client_path = DM_EVENT_FIFO_CLIENT,
.server_path = DM_EVENT_FIFO_SERVER
};
int nothreads; int nothreads;
//struct sys_log logdata = {DAEMON_NAME, LOG_DAEMON}; //struct sys_log logdata = {DAEMON_NAME, LOG_DAEMON};
@ -2005,9 +1998,6 @@ int main(int argc, char *argv[])
//multilog_init_verbose(std_syslog, _LOG_DEBUG); //multilog_init_verbose(std_syslog, _LOG_DEBUG);
//multilog_async(1); //multilog_async(1);
if (!_systemd_activation)
_init_fifos(&fifos);
pthread_mutex_init(&_global_mutex, NULL); pthread_mutex_init(&_global_mutex, NULL);
if (!_systemd_activation && !_open_fifos(&fifos)) if (!_systemd_activation && !_open_fifos(&fifos))