Merge commit 'fml/master' into next

[paraslash.git] / fade.c

diff --git a/fade.c b/fade.c
index 48faed83124baeea273337ae950b0e88aeb8fc03..aa7997eb94b87ee34dc8b3d334c9e7a200ddf88d 100644 (file)
--- a/fade.c
+++ b/fade.c
@@ -1,34 +1,33 @@
 /*
- * Copyright (C) 1998-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1998-2009 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file fade.c A volume fader and alarm clock for linux. */
 
+#include <regex.h>
 #include <sys/types.h>
 #include <dirent.h>
-
-#include "fade.cmdline.h"
-#include "para.h"
-#include "fd.h"
-
-#include <stropts.h>
+#include <sys/ioctl.h>
 #include <ctype.h>
 #include <stdlib.h> /* EXIT_SUCCESS */
 #include <unistd.h>
 #include <signal.h>
 #include <string.h>
 #include <limits.h>
-#include <linux/soundcard.h>
+#include <sys/soundcard.h>
+
+#include "fade.cmdline.h"
+#include "para.h"
+#include "fd.h"
 #include "string.h"
 #include "error.h"
 
-
 INIT_FADE_ERRLISTS;
 struct fade_args_info conf;
 
-void para_log(__a_unused int ll, const char *fmt,...)
+__printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...)
 {
        va_list argp;
        time_t t1;
@@ -217,7 +216,7 @@ static int sweet_dreams(void)
                tm->tm_sec = 0;
        } else {
                t1 += 9 * 60 * 60; /* nine hours from now */
-               PARA_INFO_LOG("default wake time: %lu\n", t1);
+               PARA_INFO_LOG("default wake time: %lu\n", (long unsigned)t1);
                tm = localtime(&t1);
        }
        wake_time_epoch = mktime(tm);