Complete Disobedience transition to event_ from _monitor.

[disorder] / server / normalize.c

diff --git a/server/normalize.c b/server/normalize.c
index 28faa8168ba9d55ef95fbd1c16ceb34fce592110..956eb6b7a973a89e50fa67e08243981da767ef2c 100644 (file)
--- a/server/normalize.c
+++ b/server/normalize.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder
 /*
  * This file is part of DisOrder

- * Copyright (C) 2007 Richard Kettlewell
+ * Copyright (C) 2007, 2008 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


@@ -25,23 +25,7 @@
  * and eliminate the dependency on sox.
  */
 
  * and eliminate the dependency on sox.
  */
 

-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <locale.h>
-#include <errno.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-
-#include "syscalls.h"
-#include "log.h"
-#include "configuration.h"
-#include "speaker-protocol.h"
-#include "defs.h"
+#include "disorder-server.h"

 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },
 
 static const struct option options[] = {
   { "help", no_argument, 0, 'h' },


@@ -71,13 +55,6 @@ static void help(void) {
   exit(0);
 }
 
   exit(0);
 }
 

-/* display version number and terminate */
-static void version(void) {
-  xprintf("%s", disorder_version_string);
-  xfclose(stdout);
-  exit(0);
-}
-

 /** @brief Copy bytes from one file descriptor to another
  * @param infd File descriptor read from
  * @param outfd File descriptor to write to
 /** @brief Copy bytes from one file descriptor to another
  * @param infd File descriptor read from
  * @param outfd File descriptor to write to


@@ -157,7 +134,7 @@ int main(int argc, char attribute((unused)) **argv) {
   while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();
   while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
     switch(n) {
     case 'h': help();

-    case 'V': version();
+    case 'V': version("disorder-normalize");

     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'D': debugging = 0; break;
     case 'c': configfile = optarg; break;
     case 'd': debugging = 1; break;
     case 'D': debugging = 0; break;