X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/c76bc536092c8c20cf6cff5fb86b9846f2fe8662..477b12ff719d3749b8d8f85035bd6384fee9be0d:/server/normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 8935927..2f48628 100644
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -40,7 +40,7 @@ static const struct option options[] = {
 };
 
 /* display usage message and terminate */
-static void help(void) {
+static void attribute((noreturn)) help(void) {
   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");
     }
   }
+  config_per_user = 0;
   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));
-        assert(consumed != 0);
         memmove(buffer, buffer + consumed, used - consumed);
         used -= consumed;
       }