Mark `help' and `version' functions as not returning.

[disorder] / clients / disorder.c

diff --git a/clients/disorder.c b/clients/disorder.c
index a96a0592fc68a304858a358047154737d01e2be6..8fdbc60fb50fe2717b575d8755c9a7829a1374bc 100644 (file)
--- a/clients/disorder.c
+++ b/clients/disorder.c
@@ -36,7 +36,6 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>
 #endif
-#include <pcre.h>
 #include <ctype.h>
 #if HAVE_GCRYPT_H
 # include <gcrypt.h>
@@ -84,7 +83,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 [OPTIONS] COMMAND ...\n"
          "Options:\n"
@@ -349,6 +348,7 @@ static void cf_set_volume(char **argv) {
 }
 
 static void cf_log(char attribute((unused)) **argv) {
+  setvbuf(stdout, 0, _IOLBF, BUFSIZ);
   if(disorder_log(getclient(), sink_stdio("stdout", stdout))) exit(EXIT_FAILURE);
 }
 
@@ -498,7 +498,7 @@ static const struct option setup_guest_options[] = {
   { 0, 0, 0, 0 }
 };
 
-static void help_setup_guest(void) {
+static void attribute((noreturn)) help_setup_guest(void) {
   xprintf("Usage:\n"
          "  disorder setup-guest [OPTIONS]\n"
          "Options:\n"
@@ -844,7 +844,7 @@ static const struct client_command {
                       "Display the server version" },
 };
 
-static void help_commands(void) {
+static void attribute((noreturn)) help_commands(void) {
   unsigned n, max = 0, l;
 
   xprintf("Command summary:\n");
@@ -880,8 +880,7 @@ int main(int argc, char **argv) {
   mem_init();
   network_init();
   /* garbage-collect PCRE's memory */
-  pcre_malloc = xmalloc;
-  pcre_free = xfree;
+  regexp_setup();
   if(!setlocale(LC_CTYPE, "")) disorder_fatal(errno, "error calling setlocale");
   if(!setlocale(LC_TIME, "")) disorder_fatal(errno, "error calling setlocale");
   while((n = getopt_long(argc, argv, "+hVc:dHlNu:p:", options, 0)) >= 0) {