Remove some obsolete code

[disorder] / server / deadlock.c

diff --git a/server/deadlock.c b/server/deadlock.c
index bce3eee6037e3fadeecf2acbb5a056cdb0ff52cd..dba28d3e7e3b846847e5d1dd5c74bb4f88c82f28 100644 (file)
--- a/server/deadlock.c
+++ b/server/deadlock.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder 
 /*
  * This file is part of DisOrder 

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


@@ -39,8 +39,10 @@
 #include "defs.h"
 #include "mem.h"
 #include "kvp.h"
 #include "defs.h"
 #include "mem.h"
 #include "kvp.h"

+#include "rights.h"

 #include "trackdb.h"
 #include "trackdb-int.h"
 #include "trackdb.h"
 #include "trackdb-int.h"

+#include "version.h"

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


@@ -70,13 +72,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);
-}
-

 int main(int argc, char **argv) {
   int n, err, aborted, logsyslog = !isatty(2);
 
 int main(int argc, char **argv) {
   int n, err, aborted, logsyslog = !isatty(2);
 


@@ -85,7 +80,7 @@ int main(int argc, char **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-deadlock");

     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;