server/*.c: Don't try reading per-user configuration.

[disorder] / server / normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 89359273561602345b549d24f004bf26453edc80..2f4862891e7fed07884bb384f8b1ad175207db27 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -40,7 +40,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-normalize [OPTIONS]\n"
          "Options:\n"
   xprintf("Usage:\n"
          "  disorder-normalize [OPTIONS]\n"
          "Options:\n"


@@ -163,6 +163,7 @@ int main(int argc, char attribute((unused)) **argv) {
     default: disorder_fatal(0, "invalid option");
     }
   }
     default: disorder_fatal(0, "invalid option");
     }
   }

+  config_per_user = 0;

   if(config_read(1, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(logsyslog) {
   if(config_read(1, NULL))
     disorder_fatal(0, "cannot read configuration");
   if(logsyslog) {


@@ -278,7 +279,6 @@ int main(int argc, char attribute((unused)) **argv) {
                                                  converted, 0);
         //syslog(LOG_INFO, "used=%zu consumed=%zu", used, consumed);
         D(("consumed=%zu", consumed));
                                                  converted, 0);
         //syslog(LOG_INFO, "used=%zu consumed=%zu", used, consumed);
         D(("consumed=%zu", consumed));

-        assert(consumed != 0);

         memmove(buffer, buffer + consumed, used - consumed);
         used -= consumed;
       }
         memmove(buffer, buffer + consumed, used - consumed);
         used -= consumed;
       }