Merge commit 'remotes/fml/master'

[paraslash.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index 46eb8f19196acfe37f280eb6650223437acdbf1b..931124e65fe6a9224851c24c5b33f6e8d5dd6435 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -1,19 +1,7 @@
 /*
  * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
  *
 /*
  * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
  *

- *     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
- *     the Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.

  */
 
 /** \file daemon.c some helpers for programs that detach from the console */
  */
 
 /** \file daemon.c some helpers for programs that detach from the console */


@@ -171,13 +159,15 @@ time_t server_uptime(enum uptime set_or_get)
 {
        static time_t startuptime;
        time_t now;
 {
        static time_t startuptime;
        time_t now;

+       double diff;

 
        if (set_or_get == UPTIME_SET) {
                time(&startuptime);
                return 0;
        }
        time(&now);
 
        if (set_or_get == UPTIME_SET) {
                time(&startuptime);
                return 0;
        }
        time(&now);

-       return (time_t) difftime(now, startuptime);
+       diff = difftime(now, startuptime);
+       return (time_t) diff;

 }
 
 /**
 }
 
 /**


@@ -189,7 +179,7 @@ time_t server_uptime(enum uptime set_or_get)
  */
 __malloc char *uptime_str(void)
 {
  */
 __malloc char *uptime_str(void)
 {

-       time_t t = server_uptime(UPTIME_GET);
+       long t = server_uptime(UPTIME_GET);

        return make_message("%li:%02li:%02li", t / 86400,
                (t / 3600) % 24, (t / 60) % 60);
 }
        return make_message("%li:%02li:%02li", t / 86400,
                (t / 3600) % 24, (t / 60) % 60);
 }