Code cleanup: mostly removing empty lines

[ngircd-alex.git] / src / ngircd / ngircd.c

diff --git a/src/ngircd/ngircd.c b/src/ngircd/ngircd.c
index 2fd60ef8713295d08bd9276110539b65e97697c6..e595caf03ceb0567f478b1939080e0a727d13d71 100644 (file)
--- a/src/ngircd/ngircd.c
+++ b/src/ngircd/ngircd.c
@@ -1,6 +1,6 @@
 /*
  * ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c)2001-2010 Alexander Barton (alex@barton.de).
+ * Copyright (c)2001-2011 Alexander Barton (alex@barton.de) and Contributors.
  *
  * 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
@@ -9,7 +9,6 @@
  * Please read the file COPYING, README and AUTHORS for more information.
  */
 
-
 #include "portab.h"
 
 /**
@@ -49,10 +48,6 @@
 #include "io.h"
 #include "irc.h"
 
-#ifdef ZEROCONF
-#include "rendezvous.h"
-#endif
-
 #include "exp.h"
 #include "ngircd.h"
 
@@ -69,6 +64,7 @@ static void Setup_FDStreams PARAMS(( int fd ));
 
 static bool NGIRCd_Init PARAMS(( bool ));
 
+
 /**
  * The main() function of ngIRCd.
  * Here all starts: this function is called by the operating system loader,
@@ -279,16 +275,8 @@ main( int argc, const char *argv[] )
                 * called with already dropped privileges ... */
                Channel_Init( );
                Client_Init( );
-#ifdef ZEROCONF
-               Rendezvous_Init( );
-#endif
                Conn_Init( );
 
-#ifdef DEBUG
-               /* Redirect stderr handle to "error file" for debugging
-                * when not running in "no daemon" mode: */
-               if( ! NGIRCd_NoDaemon ) Log_InitErrorfile( );
-#endif
                if (!io_library_init(CONNECTION_POOL)) {
                        Log(LOG_ALERT, "Fatal: Cannot initialize IO routines: %s", strerror(errno));
                        exit(1);
@@ -334,9 +322,6 @@ main( int argc, const char *argv[] )
 
                /* Alles abmelden */
                Conn_Exit( );
-#ifdef ZEROCONF
-               Rendezvous_Exit( );
-#endif
                Client_Exit( );
                Channel_Exit( );
                Log_Exit( );
@@ -375,11 +360,6 @@ Fill_Version( void )
                        strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
        strlcat( NGIRCd_VersionAddition, "TCPWRAP", sizeof NGIRCd_VersionAddition );
 #endif
-#ifdef ZEROCONF
-       if( NGIRCd_VersionAddition[0] )
-               strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
-       strlcat( NGIRCd_VersionAddition, "ZEROCONF", sizeof NGIRCd_VersionAddition );
-#endif
 #ifdef IDENTAUTH
        if( NGIRCd_VersionAddition[0] )
                strlcat( NGIRCd_VersionAddition, "+", sizeof NGIRCd_VersionAddition );
@@ -426,7 +406,7 @@ Fill_Version( void )
 
        snprintf(NGIRCd_Version, sizeof NGIRCd_Version, "%s %s-%s",
                 PACKAGE_NAME, PACKAGE_VERSION, NGIRCd_VersionAddition);
-       } /* Fill_Version */
+} /* Fill_Version */
 
 
 /**
@@ -436,7 +416,7 @@ static void
 Show_Version( void )
 {
        puts( NGIRCd_Version );
-       puts( "Copyright (c)2001-2010 Alexander Barton (<alex@barton.de>) and Contributors." );
+       puts( "Copyright (c)2001-2011 Alexander Barton (<alex@barton.de>) and Contributors." );
        puts( "Homepage: <http://ngircd.barton.de/>\n" );
        puts( "This is free software; see the source for copying conditions. There is NO" );
        puts( "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." );
@@ -567,8 +547,8 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
        *gid = pwd->pw_gid;
        endpwent();
 
-       return true;    
-}
+       return true;
+} /* NGIRCd_getNobodyID */
 
 
 static bool
@@ -721,6 +701,7 @@ NGIRCd_Init( bool NGIRCd_NoDaemon )
        if (fd > 2)
                close(fd);
        return false;
-}
+} /* NGIRCd_Init */
+
 
 /* -eof- */