X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=daemon.c;h=18ad1568fbb5074bbddd60bc99835bb49967d24e;hp=0bf2f0ac9e81d72dff8623d7ebc54014007c40e4;hb=761d9bd95a6601c0b3be6591a6b6672b755e1fbe;hpb=4867d9a4948aadde4dd59436e1c5fb0fc141ba89 diff --git a/daemon.c b/daemon.c index 0bf2f0ac..18ad1568 100644 --- a/daemon.c +++ b/daemon.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1997-2011 Andre Noll + * Copyright (C) 1997-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -10,8 +10,6 @@ #include #include /* getgrnam() */ #include -#include -#include #include #include "para.h" @@ -66,8 +64,6 @@ void daemon_set_default_log_colors(void) * \param arg The loglevel/color specifier. * * \a arg must be of the form "ll:[fg [bg]] [attr]". - * - * \return 1 On success, -1 on errors. */ void daemon_set_log_color_or_die(char const *arg) { @@ -357,7 +353,7 @@ __malloc char *get_server_uptime_str(const struct timeval *current_time) * \param ll The log level. * \param fmt The format string describing the log message. */ -__printf_2_3 void para_log(int ll, const char* fmt,...) +__printf_2_3 void daemon_log(int ll, const char* fmt,...) { va_list argp; FILE *fp; @@ -377,7 +373,7 @@ __printf_2_3 void para_log(int ll, const char* fmt,...) fprintf(fp, "%s", color); if (log_time || log_timing) { struct timeval tv; - gettimeofday(&tv, NULL); + clock_get_realtime(&tv); if (daemon_test_flag(DF_LOG_TIME)) { /* print date and time */ time_t t1 = tv.tv_sec; char str[100];