Fixed problems on systems using newer GLIB and GCC (2.96) which no

longer allow the -Wp,-lang-c-c++-comments directive.  Also cleaned
up getloadavg support that had problems on Solaris and RedHat 7.1.
Removed unused variables in a number of functions as a result of
warnings when compiled with --enable-debug config option.

clients/lcdproc/chrono.c

@@ -4,9 +4,22 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/utsname.h>
-#include <sys/time.h>
 
-#include "../../shared/sockets.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
+
+#include "shared/sockets.h"
 
 #include "main.h"
 #include "mode.h"

clients/lcdproc/load.c

@@ -4,16 +4,26 @@
 #include <unistd.h>
 #include <fcntl.h>
 
-#include "../../shared/sockets.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
+#if defined( HAVE_GETLOADAVG ) && defined( HAVE_SYS_LOADAVG_H )
+# define USE_GETLOADAVG
+#else
+# undef USE_GETLOADAVG
+#endif
+
+#include "shared/sockets.h"
 #include "main.h"
 #include "mode.h"
 #include "load.h"
 
-#ifdef HAVE_GETLOADAVG
-#include <sys/loadavg.h>
+#ifdef USE_GETLOADAVG
+# include <sys/loadavg.h>
 #endif
 
+
 int loadavg_fd = 0;
 
 static double get_loadavg (void);
@@ -22,11 +32,11 @@ static double
 get_loadavg (void)
 {
 	double load;
-#ifdef HAVE_GETLOADAVG
+#ifdef USE_GETLOADAVG
 	double loadavg[LOADAVG_NSTATS];
 #endif
 
-#ifndef HAVE_GETLOADAVG
+#ifndef USE_GETLOADAVG
 	reread (loadavg_fd, "get_load:");
 	sscanf (buffer, "%lf", &load);
 #else
@@ -39,7 +49,7 @@ get_loadavg (void)
 int
 load_init ()
 {
-#ifndef SOLARIS
+#ifndef USE_GETLOADAVG
 	if (!loadavg_fd)
 		loadavg_fd = open ("/proc/loadavg", O_RDONLY);
 #endif
@@ -49,12 +59,11 @@ load_init ()
 int
 load_close ()
 {
-#ifndef SOLARIS
+#ifndef USE_GETLOADAVG
 	if (loadavg_fd)
 		close (loadavg_fd);
 
 	loadavg_fd = 0;
-
 #endif
 	return 0;
 }

clients/lcdproc/main.c

@@ -2,7 +2,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <fcntl.h>
-#include <sys/time.h>
 #include <termios.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -15,8 +14,8 @@
 
 #include "main.h"
 #include "mode.h"
-#include "../../shared/sockets.h"
-#include "../../shared/debug.h"
+#include "shared/sockets.h"
+#include "shared/debug.h"
 
 // TODO: Commenting...  Everything!
 

clients/lcdproc/mem.c

@@ -34,8 +34,6 @@ static void get_mem_info (struct meminfo *result);
 static void
 get_mem_info (struct meminfo *result)
 {
-//  int i, res; char *bufptr;
-	int pagesize,page;
 
 #ifndef SOLARIS
 	reread (meminfo_fd, "get_meminfo:");

clients/lcdproc/mode.c

@@ -6,17 +6,20 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#ifdef IRIX
-#include <strings.h>
-#endif
 #include <fcntl.h>
 #include <unistd.h>
-#include <time.h>
-#include <sys/time.h>
 #include <sys/utsname.h>
 
-#include "../../shared/sockets.h"
+#include <string.h>
+#if defined( IRIX ) || defined( SOLARIS )
+# include <strings.h>
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "shared/sockets.h"
 
 #include "mode.h"
 #include "main.h"
@@ -29,10 +32,6 @@
 #include "load.h"
 #include "mem.h"
 
-#ifdef SOLARIS
-#include <strings.h>
-#endif
-
 int ELLIPSIS = '-';
 
 // TODO: Clean this up...  Support multiple display sizes..

configure.in

@@ -27,7 +27,7 @@ if test $debug = "yes"; then
 else
 	CFLAGS="-Wno-unused -O6"
 fi
-CFLAGS="-Wall -Wp,-lang-c-c++-comments $CFLAGS"
+CFLAGS="-Wall $CFLAGS"
 export CFLAGS
 
 dnl Checks for programs.
@@ -48,7 +48,7 @@ AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
 AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)])
 AC_CHECK_LIB(kstat, kstat_open)
 AC_CHECK_FUNCS(getloadavg swapctl)
-AC_CHECK_HEADERS(procfs.h sys/procfs.h, break)
+AC_CHECK_HEADERS(procfs.h sys/procfs.h sys/loadavg.h)
 
 dnl Some versions of Solaris require -lelf for -lkvm
 AC_CHECK_LIB(kvm, kvm_open,[

server/drivers/bayrad.c

@@ -11,12 +11,24 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/errno.h>
-#include <sys/time.h>
 #include <sys/types.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 #include "lcd.h"
 #include "bayrad.h"
 #include "drv_base.h"
-#include "../../shared/str.h"
+#include "shared/str.h"
 
 //////////////////////////////////////////////////////////////////////////
 ////////////////////// Base "class" to derive from ///////////////////////

server/drivers/curses_drv.c

@@ -37,7 +37,7 @@ curses_drv_init (struct lcd_logical_driver *driver, char *args)
 {
 	char *argv[64];
 	int argc;
-	int i, j;
+	int i;
 
 	argc = get_args (argv, args, 64);
 

server/drivers/glk.c

@@ -5,10 +5,23 @@
 #include <fcntl.h>
 #include <string.h>
 #include <sys/errno.h>
-#include <sys/time.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+#  include <sys/time.h>
+# else
+#  include <time.h>
+# endif
+#endif
 
 #include "lcd.h"
-#include "../../shared/str.h"
+#include "shared/str.h"
 #include "glk.h"
 #include "glkproto.h"
 

server/drivers/glkproto.h

@@ -57,6 +57,6 @@ int glkgetc( GLKDisplay * fd );
 int glkpoll( GLKDisplay * fd, int timeout );
 int glkflow( GLKDisplay * fd, int full, int empty );
 
-static int glkunget( GLKDisplay * fd, int c );
+int glkunget( GLKDisplay * fd, int c );
 
 #endif

server/drivers/hd44780.c

@@ -37,6 +37,9 @@
 #include <string.h>
 #include <errno.h>
 #include <sys/perm.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 // Uncomment one of the lines below to select your desired delay generation
 // mechanism.  If both defines are commented, the original I/O read timing
@@ -45,13 +48,22 @@
 #define DELAY_NANOSLEEP
 
 #if defined DELAY_GETTIMEOFDAY
-#include <sys/time.h>
-#include <unistd.h>
+# if TIME_WITH_SYS_TIME
+#  include <sys/time.h>
+#  include <time.h>
+# else
+#  if HAVE_SYS_TIME_H
+#   include <sys/time.h>
+#  else
+#   include <time.h>
+#  endif
+# endif
+
 // Only one alternate delay method at a time, please ;-)
-#undef DELAY_NANOSLEEP
+# undef DELAY_NANOSLEEP
 #elif defined DELAY_NANOSLEEP
-#include <sched.h>
-#include <time.h>
+# include <sched.h>
+# include <time.h>
 #endif
 
 #include "../../shared/str.h"
@@ -178,7 +190,6 @@ HD44780_init (lcd_logical_driver * driver, char *args)
 			connIdx = j;
 			++i;
 		} else if (0 == strcmp (argv[i], "-v") || 0 == strcmp (argv[i], "--vspan")) {
-			int j = 0;
 			if (i + 1 >= argc) {
 				fprintf (stderr, "HD44780_init: %s requires an argument\n", argv[i]);
 				return -1;
@@ -810,7 +821,7 @@ parse_span_list (int *spanListArray[], int *spLsize, int *dispOffsets[], int *dO
 				for (++j; spanlist[j] < '1' || spanlist[j] > '9'; ++j);
 			} else {
 				fprintf (stderr, "Error reallocing for span list\n");
-				retVal - 1;
+				retVal = -1;
 			}
 		} else {
 			fprintf (stderr, "Error reading spansize\n");

server/drivers/joy.c

@@ -8,8 +8,6 @@
 #include <sys/ioctl.h>
 #include <sys/types.h>
 
-#define __u32 unsigned int
-#define __u8 unsigned char
 #include <linux/joystick.h>
 
 #include "../../shared/debug.h"
@@ -50,7 +48,7 @@ joy_init (struct lcd_logical_driver *driver, char *args)
 {
 	char device[256];
 	char *argv[64];
-	int argc, i, j;
+	int argc, i;
 
 	joy = driver;
 

server/main.c

@@ -70,10 +70,9 @@ main (int argc, char **argv)
 {
 	// TODO:  Use a config file!
 	//char cfgfile[256] = "/etc/LCDd.cf";
-	int i, err, tmp;
+	int i, err;
 	int daemon_mode = 1;
 	int disable_server_screen = 1;
-	int child;
 	screen *s = NULL;
 	char *str, *ing;				  // strings for commandline handling
 //   screen_size *size = &sizes[0]; // No longer needed
@@ -100,6 +99,7 @@ main (int argc, char **argv)
 	// Now, go into daemon mode...
 #ifndef DEBUG
 	if (daemon_mode) {
+		int child;
 		if ((child = fork ()) != 0) {
 			usleep (1500000);		  // Wait for child to initialize
 			exit (0);				  /* PARENT EXITS */

server/menu.c

@@ -28,7 +28,6 @@
 #include "menu.h"
 
 // FIXME: Implement this where it is supposed to be...
-#include <time.h>
 void
 framedelay ()
 {

server/serverscreens.c

@@ -1,13 +1,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <time.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
-#include "../shared/debug.h"
+#include "shared/debug.h"
 
 #include "drivers/lcd.h"
 
@@ -152,20 +151,21 @@ no_screen_screen (int timer)
 int
 goodbye_screen ()
 {
-	char
-	*b20 = "                    ", *t20 = "  Thanks for using  ",
+	char *b20 = "                    ";
+	char *t20 = "  Thanks for using  ";
 #ifdef LINUX
-	*l20 = " LCDproc and Linux! ",
+	char *l20 = " LCDproc and Linux! ";
 #else
-	*l20 = "      LCDproc!      ",
+	char *l20 = "      LCDproc!      ";
 #endif
-	*b16 = "                ", *t16 = "Thanks for using",
+
+	char *b16 = "                ";
+	char *t16 = "Thanks for using";
 #ifdef LINUX
-	*l16 = " LCDproc+Linux! ",
+	char *l16 = " LCDproc+Linux! ";
 #else
-	*l16 = "    LCDproc!    ",
+	char *l16 = "    LCDproc!    ";
 #endif
-	*nil = "";
 
 	lcd.clear ();
 

server/sock.c

@@ -13,10 +13,10 @@
 #include <arpa/inet.h>
 #include <fcntl.h>
 
-#include "../shared/sockets.h"
+#include "shared/sockets.h"
 #include "sock.h"
 #include "clients.h"
-#include "../shared/debug.h"
+#include "shared/debug.h"
 
 /**************************************************
   LCDproc sockets code...

shared/sockets.c

@@ -5,7 +5,6 @@
 #include <stdlib.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <netinet/in.h>
 #include <netdb.h>