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

cleanup: extend struct init usage

Browse Source
This commit is contained in:
Zdenek Kabelac 2014-02-22 20:28:30 +01:00
parent 0118d6aa48
commit 408e276a61
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
daemons/lvmetad/lvmetad-core.c
View File

@ -1189,7 +1189,7 @@ static int fini(daemon_state *s)
return 1; return 1;
} }
static void usage(char *prog, FILE *file) static void usage(const char *prog, FILE *file)
{ {
fprintf(file, "Usage:\n" fprintf(file, "Usage:\n"
"%s [-V] [-h] [-f] [-l {all|wire|debug}] [-s path]\n\n" "%s [-V] [-h] [-f] [-l {all|wire|debug}] [-s path]\n\n"
@ -1204,27 +1204,19 @@ 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;
lvmetad_state ls; lvmetad_state ls = { .log_config = "" };
daemon_state s = { daemon_state s = {
.daemon_fini = fini, .daemon_fini = fini,
.daemon_init = init, .daemon_init = init,
.handler = handler, .handler = handler,
.name = "lvmetad", .name = "lvmetad",
.pidfile = getenv("LVM_LVMETAD_PIDFILE"), .pidfile = getenv("LVM_LVMETAD_PIDFILE") ? : LVMETAD_PIDFILE,
.private = &ls, .private = &ls,
.protocol = "lvmetad", .protocol = "lvmetad",
.protocol_version = 1, .protocol_version = 1,
.socket_path = getenv("LVM_LVMETAD_SOCKET"), .socket_path = getenv("LVM_LVMETAD_SOCKET") ? : LVMETAD_SOCKET,
}; };
if (!s.pidfile)
s.pidfile = LVMETAD_PIDFILE;
if (!s.socket_path)
s.socket_path = LVMETAD_SOCKET;
ls.log_config = "";
// use getopt_long // use getopt_long
while ((opt = getopt(argc, argv, "?fhVl:p:s:")) != EOF) { while ((opt = getopt(argc, argv, "?fhVl:p:s:")) != EOF) {
switch (opt) { switch (opt) {
@ -1253,5 +1245,6 @@ int main(int argc, char *argv[])
} }
daemon_start(s); daemon_start(s);
return 0; return 0;
} }