Merge branch 'refs/heads/t/simple_error_codes'

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index 1f93194474374e7450fec6a4895309c4529c5226..a023b1526931c1eeeb3fcec7be3a6b6c72662c69 100644 (file)
--- a/server.c
+++ b/server.c
@@ -18,7 +18,7 @@
  *     - Buffer trees: \ref buffer_tree.h,
  *     - Sideband API: \ref sideband.h,
  *     - Crypto: \ref crypt.h, \ref crypt_backend.h,
- *     - Error subsystem: \ref error.h, \ref error2.c,
+ *     - Error subsystem: \ref error.h,
  *     - Inter process communication: \ref ipc.h,
  *     - Forward error correction: \ref fec.h,
  *     - Daemons: \ref daemon.h,
@@ -65,10 +65,10 @@
 #include "ggo.h"
 #include "version.h"
 
-__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
+/** Array of error strings. */
+DEFINE_PARA_ERRLIST;
 
-/** Define the array of error lists needed by para_server. */
-INIT_SERVER_ERRLISTS;
+__printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
 
 /** Shut down non-authorized connections after that many seconds. */
 #define ALARM_TIMEOUT 10