Took a closer `look' at last nights changes..

[collectd.git] / src / collectd.c

diff --git a/src/collectd.c b/src/collectd.c
index c7ea35b..76c62d9 100644 (file)
--- a/src/collectd.c
+++ b/src/collectd.c
@@ -31,7 +31,7 @@
 
 static int loop = 0;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
 kstat_ctl_t *kc;
 #endif /* HAVE_LIBKSTAT */
 
@@ -45,18 +45,16 @@ int   num_pinghosts = 0;
  */
 time_t curtime;
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
 int operating_mode;
 #endif
 
-static void
-sigIntHandler (int signal)
+static void sigIntHandler (int signal)
 {
        loop++;
 }
 
-static int
-change_basedir (char *dir)
+static int change_basedir (char *dir)
 {
        int dirlen = strlen (dir);
        
@@ -91,9 +89,8 @@ change_basedir (char *dir)
        return (0);
 } /* static int change_basedir (char *dir) */
 
-#ifdef HAVE_LIBKSTAT
-static void
-update_kstat (void)
+#if HAVE_LIBKSTAT
+static void update_kstat (void)
 {
        if (kc == NULL)
        {
@@ -118,8 +115,7 @@ update_kstat (void)
 } /* static void update_kstat (void) */
 #endif /* HAVE_LIBKSTAT */
 
-static void
-exit_usage (char *name)
+static void exit_usage (char *name)
 {
        printf ("Usage: "PACKAGE" [OPTIONS]\n\n"
                        
@@ -127,12 +123,6 @@ exit_usage (char *name)
                        "  General:\n"
                        "    -C <file>       Configuration file.\n"
                        "                    Default: "CONFIGFILE"\n"
-                       /* sure you want a configFILE?
-                          what about a configDIR? - niki */
-                       /*
-                       "    -C <dir>        Configuration directory.\n"
-                       "                    Default: "CONFIGDIR"\n"
-                       */
 #if COLLECT_DAEMON
                        "    -P <file>       PID file.\n"
                        "                    Default: "PIDFILE"\n"
@@ -164,17 +154,16 @@ exit_usage (char *name)
        exit (0);
 } /* static void exit_usage (char *name) */
 
-static int
-start_client (void)
+static int start_client (void)
 {
        int sleepingtime;
 
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
        kc = NULL;
        update_kstat ();
 #endif
 
-#ifdef HAVE_LIBSTATGRAB
+#if HAVE_LIBSTATGRAB
        if (sg_init ())
        {
                syslog (LOG_ERR, "sg_init: %s", sg_str_error (sg_get_error ()));
@@ -193,7 +182,7 @@ start_client (void)
        while (loop == 0)
        {
                curtime = time (NULL);
-#ifdef HAVE_LIBKSTAT
+#if HAVE_LIBKSTAT
                update_kstat ();
 #endif
                plugin_read_all ();
@@ -210,9 +199,8 @@ start_client (void)
        return (0);
 } /* static int start_client (void) */
 
-#ifdef HAVE_LIBRRD
-static int
-start_server (void)
+#if HAVE_LIBRRD
+static int start_server (void)
 {
        char *host;
        char *type;
@@ -235,8 +223,7 @@ start_server (void)
 #endif /* HAVE_LIBRRD */
 
 #if COLLECT_DAEMON
-static int
-pidfile_create (const char *file)
+static int pidfile_create (const char *file)
 {
        FILE *fh;
 
@@ -257,34 +244,31 @@ pidfile_create (const char *file)
 #endif /* COLLECT_DAEMON */
 
 #if COLLECT_DAEMON
-static int
-pidfile_remove (const char *file)
+static int pidfile_remove (const char *file)
 {
        if (file == NULL) {
                file = PIDFILE;
        }
-      return (unlink (file));
+       return (unlink (file));
 } /* static int pidfile_remove (const char *file) */
 #endif /* COLLECT_DAEMON */
 
-int
-main (int argc, char **argv)
+int main (int argc, char **argv)
 {
        struct sigaction sigIntAction, sigChldAction;
        char *configfile = CONFIGFILE;
-/* or  char *configdir = CONFIGDIR; */
        char *plugindir  = PLUGINDIR;
        char *datadir    = PKGLOCALSTATEDIR;
 #if COLLECT_DAEMON
        char *pidfile    = PIDFILE;
        pid_t pid;
-       int daemonize = 1;
+       int daemonize    = 1;
 #endif
 #if COLLECT_DEBUG
        char *logfile    = LOGFILE;
 #endif
 
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        operating_mode = MODE_LOCAL;
 #endif
 
@@ -316,7 +300,7 @@ main (int argc, char **argv)
 
                switch (c)
                {
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
                        case 'c':
                                operating_mode = MODE_CLIENT;
                                break;
@@ -331,7 +315,6 @@ main (int argc, char **argv)
 #endif /* HAVE_LIBRRD */
                        case 'C':
                                configfile = optarg;
-                               /* configdir = optarg; */
                                break;
 #if COLLECT_DAEMON
                        case 'P':
@@ -445,7 +428,7 @@ main (int argc, char **argv)
        /*
         * run the actual loops
         */
-#ifdef HAVE_LIBRRD
+#if HAVE_LIBRRD
        if (operating_mode == MODE_SERVER)
                start_server ();
        else /* if (operating_mode == MODE_CLIENT || operating_mode == MODE_LOCAL) */