lib/configuration.c, etc.: Replace `config_userconf()' by a variable.

[disorder] / server / stats.c

diff --git a/server/stats.c b/server/stats.c
index 60e2e39cd2129d897ef5b2e2fab5a31df04b6232..ba8a223e05e7e49ee5ad5e52c856c17cd33515da 100644 (file)
--- a/server/stats.c
+++ b/server/stats.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2007, 2008 Richard Kettlewell
+ * Copyright (C) 2007-2009 Richard Kettlewell

  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by


@@ -36,7 +36,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-stats [OPTIONS]\n"
          "Options:\n"
   xprintf("Usage:\n"
          "  disorder-stats [OPTIONS]\n"
          "Options:\n"


@@ -74,6 +74,7 @@ int main(int argc, char **argv) {
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }
     openlog(progname, LOG_PID, LOG_DAEMON);
     log_default = &log_syslog;
   }

+  config_per_user = 0;

   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   trackdb_init(TRACKDB_NO_RECOVER);
   if(config_read(0, NULL))
     disorder_fatal(0, "cannot read configuration");
   trackdb_init(TRACKDB_NO_RECOVER);