X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=ceb91dafb974ab34e7c6bc89d5195c64c0d8be30;hp=1f66b363e0dc836f629ace5170c661ad2b9e364e;hb=41f13bf6cac519b46ed24892e2c84384ef5dc500;hpb=2ed89c59f0efcd0a2763f47c7d3455663241e623;ds=sidebyside diff --git a/fade.c b/fade.c index 1f66b363..ceb91daf 100644 --- a/fade.c +++ b/fade.c @@ -20,7 +20,9 @@ #include "fade.cmdline.h" #include "para.h" +#include "fd.h" +#include #include #include #include /* EXIT_SUCCESS */ @@ -34,7 +36,7 @@ struct gengetopt_args_info args_info; -void para_log(__unused int ll, char *fmt,...) +void para_log(__a_unused int ll, const char *fmt,...) { va_list argp; time_t t1; @@ -53,11 +55,11 @@ void para_log(__unused int ll, char *fmt,...) */ static int open_mixer(void) { - int mixer_fd; + int mixer_fd; - if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0) - return -1; - return mixer_fd; + if ((mixer_fd = open(args_info.mixer_device_arg, O_RDWR, 0)) < 0) + return -1; + return mixer_fd; } /* @@ -167,10 +169,10 @@ out: return 1; } -static int client_cmd(char *cmd,...) +static int client_cmd(const char *cmd,...) { int ret, fds[3] = {0, 0, 0}; - pid_t pid; + pid_t pid; char *cmdline = make_message(BINDIR "/para_client %s", cmd); PARA_INFO_LOG("%s", cmdline); ret = para_exec_cmdline_pid(&pid, cmdline, fds);