disobedience/disobedience.h: Declare variables as `extern'.

[disorder] / server / speaker.c

diff --git a/server/speaker.c b/server/speaker.c
index a55b074905828adf4cce6e0228743d809d9c283e..719a6d86d791b1ab9145f1e83b4ac93c45fb9bff 100644 (file)
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -235,7 +235,7 @@ static const struct option options[] = {
 };
 
 /* Display usage message and terminate. */
 };
 
 /* Display usage message and terminate. */

-static void help(void) {
+static void attribute((noreturn)) help(void) {

   xprintf("Usage:\n"
          "  disorder-speaker [OPTIONS]\n"
          "Options:\n"
   xprintf("Usage:\n"
          "  disorder-speaker [OPTIONS]\n"
          "Options:\n"


@@ -769,6 +769,7 @@ int main(int argc, char **argv) {
     log_default = &log_syslog;
   }
   config_uaudio_apis = uaudio_apis;
     log_default = &log_syslog;
   }
   config_uaudio_apis = uaudio_apis;

+  config_per_user = 0;

   if(config_read(1, NULL)) disorder_fatal(0, "cannot read configuration");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);
   if(config_read(1, NULL)) disorder_fatal(0, "cannot read configuration");
   /* ignore SIGPIPE */
   signal(SIGPIPE, SIG_IGN);