watchdog/contribs7/watchdog-5.6-cleanup.patch

General cleanups, sent upstream on 2009-03-26.

diff -ur watchdog-5.6/include/extern.h watchdog-5.6-cleanup/include/extern.h
--- watchdog-5.6/include/extern.h       2009-03-13 12:46:57.000000000 +0000
+++ watchdog-5.6-cleanup/include/extern.h       2009-03-26 10:15:51.000000000 +0000
@@ -71,4 +71,11 @@
 
 void do_shutdown(int errorcode);
 void sigterm_handler(int arg);
-void terminate(void);
+
+#ifdef __GNUC__
+#define GCC_NORETURN __attribute__((noreturn))
+#else
+#define GCC_NORETURN
+#endif
+
+void terminate(void) GCC_NORETURN;
diff -ur watchdog-5.6/src/watchdog.c watchdog-5.6-cleanup/src/watchdog.c
--- watchdog-5.6/src/watchdog.c 2009-03-22 12:52:24.000000000 +0000
+++ watchdog-5.6-cleanup/src/watchdog.c 2009-03-26 10:12:43.000000000 +0000
@@ -25,6 +25,7 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <sys/ioctl.h>
 #include <linux/watchdog.h>
 #define __USE_GNU
 #include <string.h>
@@ -690,7 +691,7 @@
               driver default) */
            if (ioctl(watchdog, WDIOC_SETTIMEOUT, &devtimeout) < 0) {
 #if USE_SYSLOG
-               syslog(LOG_ERR, "cannot set timeout %s (errno = %d = '%m')", strerror(errno), devtimeout, errno);
+                syslog(LOG_ERR, "cannot set timeout %d (errno = %d = '%m')", devtimeout, errno);
 #else                          
                perror(progname);
 #endif                    
diff -ur watchdog-5.6/src/wd_keepalive.c watchdog-5.6-cleanup/src/wd_keepalive.c
--- watchdog-5.6/src/wd_keepalive.c     2009-03-12 14:30:07.000000000 +0000
+++ watchdog-5.6-cleanup/src/wd_keepalive.c     2009-03-26 10:19:05.000000000 +0000
@@ -34,6 +34,8 @@
 #include <syslog.h>
 #endif         
 
+#include "extern.h"
+
 #define TRUE  1
 #define FALSE 0
 
1	slords	1.1	General cleanups, sent upstream on 2009-03-26.
2
3			diff -ur watchdog-5.6/include/extern.h watchdog-5.6-cleanup/include/extern.h
4			--- watchdog-5.6/include/extern.h 2009-03-13 12:46:57.000000000 +0000
5			+++ watchdog-5.6-cleanup/include/extern.h 2009-03-26 10:15:51.000000000 +0000
6			@@ -71,4 +71,11 @@
7
8			void do_shutdown(int errorcode);
9			void sigterm_handler(int arg);
10			-void terminate(void);
11			+
12			+#ifdef __GNUC__
13			+#define GCC_NORETURN __attribute__((noreturn))
14			+#else
15			+#define GCC_NORETURN
16			+#endif
17			+
18			+void terminate(void) GCC_NORETURN;
19			diff -ur watchdog-5.6/src/watchdog.c watchdog-5.6-cleanup/src/watchdog.c
20			--- watchdog-5.6/src/watchdog.c 2009-03-22 12:52:24.000000000 +0000
21			+++ watchdog-5.6-cleanup/src/watchdog.c 2009-03-26 10:12:43.000000000 +0000
22			@@ -25,6 +25,7 @@
23			#include <sys/wait.h>
24			#include <sys/stat.h>
25			#include <sys/types.h>
26			+#include <sys/ioctl.h>
27			#include <linux/watchdog.h>
28			#define __USE_GNU
29			#include <string.h>
30			@@ -690,7 +691,7 @@
31			driver default) */
32			if (ioctl(watchdog, WDIOC_SETTIMEOUT, &devtimeout) < 0) {
33			#if USE_SYSLOG
34			- syslog(LOG_ERR, "cannot set timeout %s (errno = %d = '%m')", strerror(errno), devtimeout, errno);
35			+ syslog(LOG_ERR, "cannot set timeout %d (errno = %d = '%m')", devtimeout, errno);
36			#else
37			perror(progname);
38			#endif
39			diff -ur watchdog-5.6/src/wd_keepalive.c watchdog-5.6-cleanup/src/wd_keepalive.c
40			--- watchdog-5.6/src/wd_keepalive.c 2009-03-12 14:30:07.000000000 +0000
41			+++ watchdog-5.6-cleanup/src/wd_keepalive.c 2009-03-26 10:19:05.000000000 +0000
42			@@ -34,6 +34,8 @@
43			#include <syslog.h>
44			#endif
45
46			+#include "extern.h"
47			+
48			#define TRUE 1
49			#define FALSE 0
50