[Patch] Reducing header inclusions
"Markus Dolze" <[email protected]>
| Newsgroups | gmane.comp.sysutils.lcdproc |
|---|---|
| Message-ID | <[email protected]> |
Hi everyone, attached is a patch I will commit soon that reduces a number of header include statements, mostly for drivers. Especially: * Do not include system headers in our own headers from 'shared/' * Remove syslog.h from all drivers * Remove fcntl.h and termios.h where not needed (e.h. libusb-based drivers) * Remove lcd.h from headers where is was already included in .c * Include <poll.h> instead of <sys/poll.h> * Better check for <time.h> together with <sys/time.h> * For hd44780 include "hd44780-low.h" in .c file instead of buried in the header file BTW: I was asking myself why we do have header files for each driver as these are not used anywhere. I think they are a left-over from the 0.4 series. Anyway, I'd like to keep those as they provide a quick overview on the API functions implemented by the driver (if header and .c are in sync). Bye Markus _______________________________________________ LCDproc mailing list [email protected] http://lists.omnipotent.net/mailman/listinfo/lcdproc
deheader.diff
(application/octet-stream, 56.2 KB)
Index: clients/lcdexec/lcdexec.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/clients/lcdexec/lcdexec.c,v
retrieving revision 1.32
diff -u -r1.32 lcdexec.c
--- clients/lcdexec/lcdexec.c 3 Feb 2010 21:50:57 -0000 1.32
+++ clients/lcdexec/lcdexec.c 18 Mar 2011 23:10:51 -0000
@@ -20,6 +20,7 @@
#include <signal.h>
#include <time.h>
#include <sys/wait.h>
+#include <stdlib.h>
#include "getopt.h"
@@ -209,7 +210,7 @@
p->status = status;
p->endtime = time(NULL);
}
- }
+ }
}
}
@@ -342,7 +343,7 @@
if (main_menu == NULL) {
report(RPT_ERR, "no main menu found in configuration");
return -1;
- }
+ }
return 0;
}
@@ -364,12 +365,12 @@
}
else {
struct utsname unamebuf;
-
+
if (uname(&unamebuf) == 0)
sock_printf(sock, "client_set -name {%s %s}\n", progname, unamebuf.nodename);
- else
+ else
sock_printf(sock, "client_set -name {%s}\n", progname);
- }
+ }
/* Create our menu */
if (menu_sock_send(main_menu, NULL, sock) < 0) {
@@ -406,7 +407,7 @@
if ((strcmp(argv[1], "select") == 0) ||
(strcmp(argv[1], "leave") == 0)) {
MenuEntry *entry;
-
+
if (argc < 3) {
report(RPT_WARNING, "Server gave invalid response");
free(str2);
@@ -434,13 +435,13 @@
if (entry->type == MT_EXEC)
exec_command(entry);
- }
+ }
}
else if ((strcmp(argv[1], "plus") == 0) ||
(strcmp(argv[1], "minus") == 0) ||
(strcmp(argv[1], "update") == 0)) {
MenuEntry *entry;
-
+
if (argc < 4) {
report(RPT_WARNING, "Server gave invalid response");
free(str2);
@@ -509,7 +510,7 @@
// TODO: make it better
report(RPT_INFO, "Server said: \"%s\"", str);
exit_program(EXIT_SUCCESS);
- }
+ }
else if (strcmp(argv[0], "huh?") == 0) {
/* Report errors */
report(RPT_WARNING, "Server said: \"%s\"", str);
@@ -575,7 +576,7 @@
default:
/* error ? */
break;
- }
+ }
buf[sizeof(buf)-1] ='\0';
envp[i] = strdup(buf);
@@ -651,7 +652,7 @@
else {
sock_printf(sock, "widget_set [%u] s2 1 3 {with code 0x%02X.}\n",
p->pid, WEXITSTATUS(p->status));
- }
+ }
}
else if (WIFSIGNALED(p->status)) {
sock_printf(sock, "widget_set [%u] s2 1 3 {killed by SIG %d.}\n",
@@ -680,7 +681,7 @@
else if (WIFSIGNALED(p->status)) {
sock_printf(sock, "widget_set [%u] s2 1 2 {killed by SIG %d}\n",
p->pid, WTERMSIG(p->status));
-
+
}
}
return 1;
@@ -737,7 +738,7 @@
for (p = proc_queue; p != NULL; p = p->next) {
p->shown |= show_procinfo_msg(p);
}
- }
+ }
}
else {
process_response(buf);
Index: clients/lcdexec/menu.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/clients/lcdexec/menu.c,v
retrieving revision 1.13
diff -u -r1.13 menu.c
--- clients/lcdexec/menu.c 30 Oct 2010 18:04:21 -0000 1.13
+++ clients/lcdexec/menu.c 18 Mar 2011 23:10:53 -0000
@@ -15,6 +15,7 @@
#include <unistd.h>
#include <string.h>
#include <strings.h>
+#include <stdlib.h>
#include "shared/report.h"
#include "shared/configfile.h"
Index: clients/lcdvc/lcd_link.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/clients/lcdvc/lcd_link.c,v
retrieving revision 1.6
diff -u -r1.6 lcd_link.c
--- clients/lcdvc/lcd_link.c 3 Feb 2010 21:51:12 -0000 1.6
+++ clients/lcdvc/lcd_link.c 18 Mar 2011 23:10:54 -0000
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+#include <stdlib.h>
#include "lcd_link.h"
#include "vc_link.h"
Index: clients/lcdvc/lcdvc.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/clients/lcdvc/lcdvc.c,v
retrieving revision 1.14
diff -u -r1.14 lcdvc.c
--- clients/lcdvc/lcdvc.c 3 Feb 2010 21:51:12 -0000 1.14
+++ clients/lcdvc/lcdvc.c 18 Mar 2011 23:10:55 -0000
@@ -20,6 +20,7 @@
#include <signal.h>
#include <fcntl.h>
#include <errno.h>
+#include <stdlib.h>
#include "getopt.h"
Index: clients/lcdvc/vc_link.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/clients/lcdvc/vc_link.c,v
retrieving revision 1.3
diff -u -r1.3 vc_link.c
--- clients/lcdvc/vc_link.c 3 Feb 2010 21:51:12 -0000 1.3
+++ clients/lcdvc/vc_link.c 18 Mar 2011 23:10:55 -0000
@@ -19,6 +19,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <errno.h>
+#include <stdlib.h>
#include "lcdvc.h"
#include "vc_link.h"
@@ -79,7 +80,7 @@
if (vc_buf == NULL) {
report(RPT_ERR, "malloc failure: %s", strerror(errno));
return -1;
- }
+ }
memset(vc_buf, ' ', vc_width * vc_height);
}
}
Index: server/drivers/CFontz.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontz.c,v
retrieving revision 1.55
diff -u -r1.55 CFontz.c
--- server/drivers/CFontz.c 6 Jan 2011 10:59:19 -0000 1.55
+++ server/drivers/CFontz.c 18 Mar 2011 23:10:59 -0000
@@ -33,7 +33,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/CFontz.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontz.h,v
retrieving revision 1.13
diff -u -r1.13 CFontz.h
--- server/drivers/CFontz.h 26 Nov 2006 20:08:56 -0000 1.13
+++ server/drivers/CFontz.h 18 Mar 2011 23:10:59 -0000
@@ -1,8 +1,6 @@
#ifndef CFONTZ_H
#define CFONTZ_H
-#include "lcd.h"
-
#define DEFAULT_CELL_WIDTH 6
#define DEFAULT_CELL_HEIGHT 8
#define DEFAULT_CONTRAST 560
Index: server/drivers/CFontz633.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontz633.c,v
retrieving revision 1.48
diff -u -r1.48 CFontz633.c
--- server/drivers/CFontz633.c 6 Jan 2011 10:59:19 -0000 1.48
+++ server/drivers/CFontz633.c 18 Mar 2011 23:11:02 -0000
@@ -54,7 +54,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/CFontz633.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontz633.h,v
retrieving revision 1.14
diff -u -r1.14 CFontz633.h
--- server/drivers/CFontz633.h 13 Feb 2010 16:43:16 -0000 1.14
+++ server/drivers/CFontz633.h 18 Mar 2011 23:11:02 -0000
@@ -1,8 +1,6 @@
#ifndef CFONTZ633_H
#define CFONTZ633_H
-#include "lcd.h"
-
#define DEFAULT_CELL_WIDTH 6
#define DEFAULT_CELL_HEIGHT 8
#define DEFAULT_CONTRAST 560
Index: server/drivers/CFontzPacket.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontzPacket.c,v
retrieving revision 1.70
diff -u -r1.70 CFontzPacket.c
--- server/drivers/CFontzPacket.c 27 Feb 2011 14:56:34 -0000 1.70
+++ server/drivers/CFontzPacket.c 18 Mar 2011 23:11:06 -0000
@@ -42,7 +42,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#include "lcd.h"
#include "CFontzPacket.h"
Index: server/drivers/CFontzPacket.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CFontzPacket.h,v
retrieving revision 1.10
diff -u -r1.10 CFontzPacket.h
--- server/drivers/CFontzPacket.h 31 Oct 2010 14:09:05 -0000 1.10
+++ server/drivers/CFontzPacket.h 18 Mar 2011 23:11:06 -0000
@@ -1,8 +1,6 @@
#ifndef CFONTZPACKET_H
#define CFONTZPACKET_H
-#include "lcd.h"
-
#define DEFAULT_CELL_HEIGHT 8
#define DEFAULT_CONTRAST 560
#define DEFAULT_DEVICE "/dev/lcd"
Index: server/drivers/CwLnx.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CwLnx.c,v
retrieving revision 1.42
diff -u -r1.42 CwLnx.c
--- server/drivers/CwLnx.c 6 Jan 2011 10:59:19 -0000 1.42
+++ server/drivers/CwLnx.c 18 Mar 2011 23:11:09 -0000
@@ -54,7 +54,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/CwLnx.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/CwLnx.h,v
retrieving revision 1.13
diff -u -r1.13 CwLnx.h
--- server/drivers/CwLnx.h 15 Feb 2008 17:59:37 -0000 1.13
+++ server/drivers/CwLnx.h 18 Mar 2011 23:11:10 -0000
@@ -22,13 +22,6 @@
#ifndef CWLNX_H
#define CWLNX_H
-#include "lcd.h"
-
-// #define DEFAULT_CONTRAST 560
-// #define DEFAULT_BRIGHTNESS 60
-// #define DEFAULT_OFFBRIGHTNESS 0
-// #define DEFAULT_EXITBRIGHTNESS 0
-
#define DEFAULT_DEVICE "/dev/lcd"
#define DEFAULT_BACKLIGHT 1
#define DEFAULT_BRIGHTNESS 700
Index: server/drivers/EyeboxOne.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/EyeboxOne.c,v
retrieving revision 1.13
diff -u -r1.13 EyeboxOne.c
--- server/drivers/EyeboxOne.c 5 Jan 2011 23:34:37 -0000 1.13
+++ server/drivers/EyeboxOne.c 18 Mar 2011 23:11:11 -0000
@@ -28,14 +28,12 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include <sys/time.h>
#include <termios.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#include <ctype.h>
-#include <sys/poll.h>
+#include <poll.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/EyeboxOne.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/EyeboxOne.h,v
retrieving revision 1.2
diff -u -r1.2 EyeboxOne.h
--- server/drivers/EyeboxOne.h 2 Apr 2007 21:29:53 -0000 1.2
+++ server/drivers/EyeboxOne.h 18 Mar 2011 23:11:11 -0000
@@ -1,8 +1,6 @@
#ifndef EYEBOXONE_H
#define EYEBOXONE_H
-#include "lcd.h"
-
MODULE_EXPORT int EyeboxOne_init (Driver *drvthis);
MODULE_EXPORT void EyeboxOne_close (Driver *drvthis);
MODULE_EXPORT int EyeboxOne_width (Driver *drvthis);
@@ -21,7 +19,7 @@
#define DEFAULT_DEVICE "/dev/ttyS1"
#define DEFAULT_SPEED 19200
-#define DEFAULT_CURSOR 0
+#define DEFAULT_CURSOR 0
#endif
Index: server/drivers/IOWarrior.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/IOWarrior.c,v
retrieving revision 1.48
diff -u -r1.48 IOWarrior.c
--- server/drivers/IOWarrior.c 30 Oct 2010 18:04:21 -0000 1.48
+++ server/drivers/IOWarrior.c 18 Mar 2011 23:11:14 -0000
@@ -30,10 +30,9 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
+#include <usb.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/IOWarrior.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/IOWarrior.h,v
retrieving revision 1.23
diff -u -r1.23 IOWarrior.h
--- server/drivers/IOWarrior.h 6 Jan 2011 10:59:19 -0000 1.23
+++ server/drivers/IOWarrior.h 18 Mar 2011 23:11:15 -0000
@@ -27,9 +27,6 @@
#ifndef IOWARRIOR_H
#define IOWARRIOR_H
-#include <usb.h>
-#include "lcd.h"
-
#define DEFAULT_SERIALNO ""
#define DEFAULT_SIZE "20x4"
#define DEFAULT_BACKLIGHT 1
Index: server/drivers/MD8800.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/MD8800.c,v
retrieving revision 1.8
diff -u -r1.8 MD8800.c
--- server/drivers/MD8800.c 30 Oct 2010 18:04:21 -0000 1.8
+++ server/drivers/MD8800.c 18 Mar 2011 23:11:29 -0000
@@ -178,7 +178,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/MD8800.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/MD8800.h,v
retrieving revision 1.3
diff -u -r1.3 MD8800.h
--- server/drivers/MD8800.h 2 Apr 2007 21:29:54 -0000 1.3
+++ server/drivers/MD8800.h 18 Mar 2011 23:11:29 -0000
@@ -22,7 +22,6 @@
#ifndef MD8800_H
#define MD8800_H
-#include "lcd.h"
#define DEFAULT_CELL_WIDTH 5
#define DEFAULT_CELL_HEIGHT 7
Index: server/drivers/MtxOrb.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/MtxOrb.c,v
retrieving revision 1.119
diff -u -r1.119 MtxOrb.c
--- server/drivers/MtxOrb.c 13 Feb 2011 21:19:43 -0000 1.119
+++ server/drivers/MtxOrb.c 18 Mar 2011 23:11:29 -0000
@@ -48,9 +48,8 @@
#include <string.h>
#include <strings.h>
#include <errno.h>
-#include <syslog.h>
#include <ctype.h>
-#include <sys/poll.h>
+#include <poll.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/MtxOrb.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/MtxOrb.h,v
retrieving revision 1.28
diff -u -r1.28 MtxOrb.h
--- server/drivers/MtxOrb.h 17 May 2009 18:30:17 -0000 1.28
+++ server/drivers/MtxOrb.h 18 Mar 2011 23:11:29 -0000
@@ -1,8 +1,6 @@
#ifndef MTXORB_H
#define MTXORB_H
-#include "lcd.h"
-
#define DEFAULT_CONTRAST 480
#define DEFAULT_ADJ_BACKLIGHT 1
#define DEFAULT_BRIGHTNESS 1000
Index: server/drivers/NoritakeVFD.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/NoritakeVFD.c,v
retrieving revision 1.18
diff -u -r1.18 NoritakeVFD.c
--- server/drivers/NoritakeVFD.c 6 Jan 2011 10:59:19 -0000 1.18
+++ server/drivers/NoritakeVFD.c 18 Mar 2011 23:11:29 -0000
@@ -54,7 +54,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/NoritakeVFD.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/NoritakeVFD.h,v
retrieving revision 1.7
diff -u -r1.7 NoritakeVFD.h
--- server/drivers/NoritakeVFD.h 30 Oct 2010 18:04:21 -0000 1.7
+++ server/drivers/NoritakeVFD.h 18 Mar 2011 23:11:29 -0000
@@ -21,7 +21,6 @@
#ifndef NORITAKEVFD_H
#define NORITAKEVFD_H
-#include "lcd.h"
#define DEFAULT_CELL_WIDTH 5
#define DEFAULT_CELL_HEIGHT 7
Index: server/drivers/SureElec.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/SureElec.c,v
retrieving revision 1.4
diff -u -r1.4 SureElec.c
--- server/drivers/SureElec.c 6 Jan 2011 10:59:19 -0000 1.4
+++ server/drivers/SureElec.c 18 Mar 2011 23:11:29 -0000
@@ -43,11 +43,8 @@
#include <termios.h>
#include <fcntl.h>
#include <string.h>
-#include <strings.h>
#include <errno.h>
-#include <syslog.h>
#include <ctype.h>
-#include <sys/poll.h>
#ifdef HAVE_CONFIG_H
#include "config.h"
Index: server/drivers/SureElec.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/SureElec.h,v
retrieving revision 1.1
diff -u -r1.1 SureElec.h
--- server/drivers/SureElec.h 29 Nov 2009 09:09:03 -0000 1.1
+++ server/drivers/SureElec.h 18 Mar 2011 23:11:29 -0000
@@ -4,8 +4,6 @@
#ifndef SUREELEC_H
#define SUREELEC_H
-#include "lcd.h"
-
#define DEFAULT_DEVICE "/dev/ttyUSB0"
#define DEFAULT_SPEED 9600
#define DEFAULT_LINEWRAP 1
Index: server/drivers/bayrad.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/bayrad.h,v
retrieving revision 1.11
diff -u -r1.11 bayrad.h
--- server/drivers/bayrad.h 13 Feb 2011 21:19:44 -0000 1.11
+++ server/drivers/bayrad.h 18 Mar 2011 23:11:29 -0000
@@ -8,8 +8,6 @@
#ifndef _BAYRAD_H
#define _BAYRAD_H
-#include "lcd.h"
-
MODULE_EXPORT int bayrad_init(Driver *drvthis);
MODULE_EXPORT void bayrad_close(Driver *drvthis);
MODULE_EXPORT int bayrad_width(Driver *drvthis);
Index: server/drivers/curses_drv.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/curses_drv.c,v
retrieving revision 1.67
diff -u -r1.67 curses_drv.c
--- server/drivers/curses_drv.c 30 Oct 2010 18:04:21 -0000 1.67
+++ server/drivers/curses_drv.c 18 Mar 2011 23:11:29 -0000
@@ -52,11 +52,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
#include <strings.h>
-#include <errno.h>
#include <ctype.h>
#ifdef HAVE_NCURSES_H
#include <ncurses.h>
@@ -67,7 +64,6 @@
#include "lcd.h"
#include "curses_drv.h"
#include "report.h"
-//#include "configfile.h"
// ACS_S9 and ACS_S1 are defined as part of XSI Curses standard, Issue 4.
// However, ACS_S3 and ACS_S7 are not; these definitions were created to support
Index: server/drivers/curses_drv.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/curses_drv.h,v
retrieving revision 1.16
diff -u -r1.16 curses_drv.h
--- server/drivers/curses_drv.h 9 Oct 2007 07:28:21 -0000 1.16
+++ server/drivers/curses_drv.h 18 Mar 2011 23:11:29 -0000
@@ -1,8 +1,6 @@
#ifndef LCD_CURSES_H
#define LCD_CURSES_H
-#include "lcd.h"
-
MODULE_EXPORT int curses_init (Driver *drvthis);
MODULE_EXPORT void curses_close (Driver *drvthis);
MODULE_EXPORT int curses_width (Driver *drvthis);
Index: server/drivers/ea65.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/ea65.c,v
retrieving revision 1.8
diff -u -r1.8 ea65.c
--- server/drivers/ea65.c 30 Oct 2010 18:04:21 -0000 1.8
+++ server/drivers/ea65.c 18 Mar 2011 23:11:30 -0000
@@ -33,7 +33,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/ea65.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/ea65.h,v
retrieving revision 1.3
diff -u -r1.3 ea65.h
--- server/drivers/ea65.h 10 Feb 2011 22:45:35 -0000 1.3
+++ server/drivers/ea65.h 18 Mar 2011 23:11:30 -0000
@@ -1,8 +1,6 @@
#ifndef EA65_H
#define EA65_H
-#include "lcd.h"
-
#define DEFAULT_BRIGHTNESS 500
#define DEFAULT_OFFBRIGHTNESS 0
Index: server/drivers/g15.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/g15.c,v
retrieving revision 1.7
diff -u -r1.7 g15.c
--- server/drivers/g15.c 30 Oct 2010 18:04:21 -0000 1.7
+++ server/drivers/g15.c 18 Mar 2011 23:11:32 -0000
@@ -31,7 +31,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#include <sys/socket.h>
#include <sys/types.h>
#include <libg15.h>
Index: server/drivers/glk.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/glk.c,v
retrieving revision 1.30
diff -u -r1.30 glk.c
--- server/drivers/glk.c 10 Feb 2011 22:48:57 -0000 1.30
+++ server/drivers/glk.c 18 Mar 2011 23:11:34 -0000
@@ -17,14 +17,12 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
-#include <errno.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+
#if TIME_WITH_SYS_TIME
# include <sys/time.h>
# include <time.h>
Index: server/drivers/glkproto.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/glkproto.c,v
retrieving revision 1.6
diff -u -r1.6 glkproto.c
--- server/drivers/glkproto.c 31 Oct 2006 16:19:44 -0000 1.6
+++ server/drivers/glkproto.c 18 Mar 2011 23:11:35 -0000
@@ -8,11 +8,12 @@
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <string.h>
#include <errno.h>
#include <stdarg.h>
-#include <sys/poll.h>
+#include <poll.h>
+
#include "glkproto.h"
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Index: server/drivers/hd44780-bwct-usb.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-bwct-usb.c,v
retrieving revision 1.16
diff -u -r1.16 hd44780-bwct-usb.c
--- server/drivers/hd44780-bwct-usb.c 30 Oct 2010 18:04:21 -0000 1.16
+++ server/drivers/hd44780-bwct-usb.c 18 Mar 2011 23:11:36 -0000
@@ -14,18 +14,10 @@
*/
#include "hd44780-bwct-usb.h"
-
+#include "hd44780-low.h"
#include "report.h"
-#include <stdlib.h>
-#include <unistd.h>
#include <string.h>
-#include <usb.h>
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
#include <errno.h>
#ifdef HAVE_CONFIG_H
Index: server/drivers/hd44780-bwct-usb.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-bwct-usb.h,v
retrieving revision 1.5
diff -u -r1.5 hd44780-bwct-usb.h
--- server/drivers/hd44780-bwct-usb.h 4 Nov 2007 16:58:00 -0000 1.5
+++ server/drivers/hd44780-bwct-usb.h 18 Mar 2011 23:11:36 -0000
@@ -2,7 +2,6 @@
#define HD_BWCT_USB_H
#include "lcd.h" /* for Driver */
-#include "hd44780-low.h"
/* vendor and product id */
#define BWCT_USB_VENDORID 0x03DA
Index: server/drivers/hd44780-ftdi.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-ftdi.c,v
retrieving revision 1.9
diff -u -r1.9 hd44780-ftdi.c
--- server/drivers/hd44780-ftdi.c 30 Oct 2010 18:04:21 -0000 1.9
+++ server/drivers/hd44780-ftdi.c 18 Mar 2011 23:11:37 -0000
@@ -29,13 +29,13 @@
*/
#include "hd44780-ftdi.h"
+#include "hd44780-low.h"
#include "report.h"
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <usb.h>
#include <stdio.h>
#include <sys/types.h>
Index: server/drivers/hd44780-ftdi.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-ftdi.h,v
retrieving revision 1.3
diff -u -r1.3 hd44780-ftdi.h
--- server/drivers/hd44780-ftdi.h 4 Nov 2007 16:58:00 -0000 1.3
+++ server/drivers/hd44780-ftdi.h 18 Mar 2011 23:11:37 -0000
@@ -2,7 +2,6 @@
#define HD_FTDI_H
#include "lcd.h" /* for Driver */
-#include "hd44780-low.h"
// initialise this particular driver
int hd_init_ftdi(Driver *drvthis);
Index: server/drivers/hd44780-lcd2usb.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-lcd2usb.c,v
retrieving revision 1.19
diff -u -r1.19 hd44780-lcd2usb.c
--- server/drivers/hd44780-lcd2usb.c 23 Dec 2010 08:01:55 -0000 1.19
+++ server/drivers/hd44780-lcd2usb.c 18 Mar 2011 23:11:38 -0000
@@ -16,15 +16,12 @@
# include "config.h"
#endif
-#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <usb.h>
#include "hd44780-lcd2usb.h"
+#include "hd44780-low.h"
#include "report.h"
-
/* connection type specific functions to be exposed using pointers in init() */
void lcd2usb_HD44780_senddata(PrivateData *p, unsigned char displayID, unsigned char flags, unsigned char ch);
void lcd2usb_HD44780_backlight(PrivateData *p, unsigned char state);
Index: server/drivers/hd44780-lcd2usb.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-lcd2usb.h,v
retrieving revision 1.5
diff -u -r1.5 hd44780-lcd2usb.h
--- server/drivers/hd44780-lcd2usb.h 23 Jan 2010 17:48:00 -0000 1.5
+++ server/drivers/hd44780-lcd2usb.h 18 Mar 2011 23:11:38 -0000
@@ -2,7 +2,6 @@
#define HD_LCD2USB_H
#include "lcd.h" /* for Driver */
-#include "hd44780-low.h"
/* vendor and product id */
#define LCD2USB_VENDORID 0x0403
Index: server/drivers/hd44780-serial.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-serial.c,v
retrieving revision 1.22
diff -u -r1.22 hd44780-serial.c
--- server/drivers/hd44780-serial.c 15 Jan 2011 19:36:16 -0000 1.22
+++ server/drivers/hd44780-serial.c 18 Mar 2011 23:11:39 -0000
@@ -50,6 +50,8 @@
#include <termios.h>
#include <errno.h>
+#include "lcd.h"
+#include "hd44780-low.h"
#include "hd44780-serial.h"
#include "report.h"
@@ -81,8 +83,8 @@
#endif
#if defined(B230400)
, { 230400, B230400 }
-#endif
-#if defined(B460800)
+#endif
+#if defined(B460800)
, { 460800, B460800 }
#endif
#if defined(B500000)
Index: server/drivers/hd44780-serial.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-serial.h,v
retrieving revision 1.11
diff -u -r1.11 hd44780-serial.h
--- server/drivers/hd44780-serial.h 15 Jan 2011 19:36:16 -0000 1.11
+++ server/drivers/hd44780-serial.h 18 Mar 2011 23:11:39 -0000
@@ -6,9 +6,6 @@
#ifndef HD44780_SERIAL_H
#define HD44780_SERIAL_H
-#include "lcd.h"
-#include "hd44780-low.h"
-
#define SERIALIF_NAME_LENGTH 20
#define DEFAULT_DEVICE "/dev/lcd"
Index: server/drivers/hd44780-usblcd.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-usblcd.c,v
retrieving revision 1.5
diff -u -r1.5 hd44780-usblcd.c
--- server/drivers/hd44780-usblcd.c 30 Oct 2010 18:04:22 -0000 1.5
+++ server/drivers/hd44780-usblcd.c 18 Mar 2011 23:11:40 -0000
@@ -19,6 +19,7 @@
*/
#include "hd44780-usblcd.h"
+#include "hd44780-low.h"
#include "report.h"
#include <stdlib.h>
Index: server/drivers/hd44780-usblcd.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-usblcd.h,v
retrieving revision 1.3
diff -u -r1.3 hd44780-usblcd.h
--- server/drivers/hd44780-usblcd.h 14 Sep 2009 18:36:44 -0000 1.3
+++ server/drivers/hd44780-usblcd.h 18 Mar 2011 23:11:40 -0000
@@ -2,7 +2,6 @@
#define HD_USBLCD_H
#include "lcd.h" /* for lcd_logical_driver */
-#include "hd44780-low.h" /* for HD44780_functions */
// initialise this particular driver
int hd_init_usblcd(Driver *drvthis);
Index: server/drivers/hd44780-usbtiny.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-usbtiny.c,v
retrieving revision 1.1
diff -u -r1.1 hd44780-usbtiny.c
--- server/drivers/hd44780-usbtiny.c 22 Nov 2010 20:01:10 -0000 1.1
+++ server/drivers/hd44780-usbtiny.c 18 Mar 2011 23:11:40 -0000
@@ -18,10 +18,9 @@
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
-#include <usb.h>
#include "hd44780-usbtiny.h"
+#include "hd44780-low.h"
#include "report.h"
Index: server/drivers/hd44780-usbtiny.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-usbtiny.h,v
retrieving revision 1.1
diff -u -r1.1 hd44780-usbtiny.h
--- server/drivers/hd44780-usbtiny.h 22 Nov 2010 20:01:10 -0000 1.1
+++ server/drivers/hd44780-usbtiny.h 18 Mar 2011 23:11:40 -0000
@@ -2,7 +2,6 @@
#define HD_USBTINY_H
#include "lcd.h" /* for Driver */
-#include "hd44780-low.h"
/* vendor and product id */
#define USBTINY_VENDORID 0x03EB
Index: server/drivers/hd44780-uss720.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-uss720.c,v
retrieving revision 1.6
diff -u -r1.6 hd44780-uss720.c
--- server/drivers/hd44780-uss720.c 30 Oct 2010 18:04:22 -0000 1.6
+++ server/drivers/hd44780-uss720.c 18 Mar 2011 23:11:41 -0000
@@ -27,18 +27,10 @@
#include "hd44780-uss720.h"
#include "hd44780-low.h"
#include "lpt-port.h"
-
#include "report.h"
-#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <usb.h>
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <fcntl.h>
-
#include <errno.h>
#ifdef HAVE_CONFIG_H
Index: server/drivers/hd44780-uss720.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780-uss720.h,v
retrieving revision 1.1
diff -u -r1.1 hd44780-uss720.h
--- server/drivers/hd44780-uss720.h 8 Oct 2008 21:07:45 -0000 1.1
+++ server/drivers/hd44780-uss720.h 18 Mar 2011 23:11:41 -0000
@@ -2,9 +2,7 @@
#define HD_USS720_H
#include "lcd.h" /* for Driver */
-#include "hd44780-low.h"
-
-// initialise this particular driver
+/* initialise this particular driver */
int hd_init_uss720(Driver *drvthis);
#endif
Index: server/drivers/hd44780.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780.c,v
retrieving revision 1.105
diff -u -r1.105 hd44780.c
--- server/drivers/hd44780.c 10 Feb 2011 23:07:04 -0000 1.105
+++ server/drivers/hd44780.c 18 Mar 2011 23:11:45 -0000
@@ -73,7 +73,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <strings.h>
#include <errno.h>
Index: server/drivers/hd44780.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/hd44780.h,v
retrieving revision 1.26
diff -u -r1.26 hd44780.h
--- server/drivers/hd44780.h 30 Nov 2008 22:34:32 -0000 1.26
+++ server/drivers/hd44780.h 18 Mar 2011 23:11:46 -0000
@@ -17,8 +17,6 @@
#ifndef HD44780_H
#define HD44780_H
-#include "lcd.h"
-
MODULE_EXPORT int HD44780_init(Driver *drvthis);
MODULE_EXPORT void HD44780_close(Driver *drvthis);
MODULE_EXPORT int HD44780_width(Driver *drvthis);
Index: server/drivers/i2500vfd.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/i2500vfd.c,v
retrieving revision 1.7
diff -u -r1.7 i2500vfd.c
--- server/drivers/i2500vfd.c 27 Feb 2011 12:46:44 -0000 1.7
+++ server/drivers/i2500vfd.c 18 Mar 2011 23:11:47 -0000
@@ -27,11 +27,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
-#include <errno.h>
-#include <time.h>
#include "i2500vfdfm.h"
Index: server/drivers/i2500vfd.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/i2500vfd.h,v
retrieving revision 1.1
diff -u -r1.1 i2500vfd.h
--- server/drivers/i2500vfd.h 15 Nov 2007 19:33:45 -0000 1.1
+++ server/drivers/i2500vfd.h 18 Mar 2011 23:11:47 -0000
@@ -1,8 +1,6 @@
#ifndef I2500VFD_H
#define I2500VFD_H
-#include "lcd.h"
-
MODULE_EXPORT int i2500vfd_init (Driver *drvthis);
MODULE_EXPORT void i2500vfd_close (Driver *drvthis);
MODULE_EXPORT int i2500vfd_width (Driver *drvthis);
Index: server/drivers/icp_a106.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/icp_a106.c,v
retrieving revision 1.13
diff -u -r1.13 icp_a106.c
--- server/drivers/icp_a106.c 16 Nov 2010 21:29:08 -0000 1.13
+++ server/drivers/icp_a106.c 18 Mar 2011 23:11:48 -0000
@@ -39,7 +39,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-//#include <time.h>
#include <sys/time.h>
#ifdef HAVE_CONFIG_H
Index: server/drivers/icp_a106.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/icp_a106.h,v
retrieving revision 1.5
diff -u -r1.5 icp_a106.h
--- server/drivers/icp_a106.h 30 Sep 2006 18:18:23 -0000 1.5
+++ server/drivers/icp_a106.h 18 Mar 2011 23:11:48 -0000
@@ -31,7 +31,6 @@
#ifndef ICP_A106_H
#define ICP_A106_H
-#include "lcd.h"
MODULE_EXPORT int icp_a106_init (Driver *drvthis);
MODULE_EXPORT void icp_a106_close (Driver *drvthis);
MODULE_EXPORT int icp_a106_width (Driver *drvthis);
Index: server/drivers/imon.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/imon.c,v
retrieving revision 1.24
diff -u -r1.24 imon.c
--- server/drivers/imon.c 10 Feb 2011 23:07:04 -0000 1.24
+++ server/drivers/imon.c 18 Mar 2011 23:11:50 -0000
@@ -30,12 +30,11 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
#include <fcntl.h>
#include <string.h>
+#include <strings.h>
#include <errno.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Index: server/drivers/imon.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/imon.h,v
retrieving revision 1.7
diff -u -r1.7 imon.h
--- server/drivers/imon.h 2 Apr 2007 21:29:54 -0000 1.7
+++ server/drivers/imon.h 18 Mar 2011 23:11:50 -0000
@@ -26,8 +26,6 @@
#ifndef IMON_H
#define IMON_H
-#include "lcd.h"
-
MODULE_EXPORT int imon_init (Driver *drvthis);
MODULE_EXPORT void imon_close (Driver *drvthis);
MODULE_EXPORT int imon_width (Driver *drvthis);
Index: server/drivers/imonlcd.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/imonlcd.c,v
retrieving revision 1.8
diff -u -r1.8 imonlcd.c
--- server/drivers/imonlcd.c 10 Feb 2011 22:06:09 -0000 1.8
+++ server/drivers/imonlcd.c 18 Mar 2011 23:11:54 -0000
@@ -38,7 +38,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
#include <fcntl.h>
#include <string.h>
#include <errno.h>
Index: server/drivers/imonlcd.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/imonlcd.h,v
retrieving revision 1.2
diff -u -r1.2 imonlcd.h
--- server/drivers/imonlcd.h 30 Oct 2010 18:04:22 -0000 1.2
+++ server/drivers/imonlcd.h 18 Mar 2011 23:11:54 -0000
@@ -16,8 +16,6 @@
#ifndef IMONLCD_H
#define IMONLCD_H
-#include "lcd.h"
-
/* mandatory functions (necessary for all drivers) */
MODULE_EXPORT int imonlcd_init (Driver *drvthis);
MODULE_EXPORT void imonlcd_close (Driver *drvthis);
Index: server/drivers/irmanin.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/irmanin.c,v
retrieving revision 1.21
diff -u -r1.21 irmanin.c
--- server/drivers/irmanin.c 2 Feb 2010 23:20:29 -0000 1.21
+++ server/drivers/irmanin.c 18 Mar 2011 23:11:55 -0000
@@ -16,7 +16,6 @@
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#include <errno.h>
#define __u32 unsigned int
#define __u8 unsigned char
@@ -96,7 +95,7 @@
if (p->device[0] != '\0') {
report(RPT_INFO, "%s: using Device %s", drvthis->name, p->device);
ptrdevice = p->device;
- }
+ }
/* What config file should be used */
strncpy(p->config, drvthis->config_get_string(drvthis->name, "Config", 0,
Index: server/drivers/irtrans.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/irtrans.c,v
retrieving revision 1.6
diff -u -r1.6 irtrans.c
--- server/drivers/irtrans.c 2 Feb 2010 23:20:29 -0000 1.6
+++ server/drivers/irtrans.c 18 Mar 2011 23:11:56 -0000
@@ -36,7 +36,6 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include <time.h>
#include <netdb.h>
Index: server/drivers/irtrans.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/irtrans.h,v
retrieving revision 1.1
diff -u -r1.1 irtrans.h
--- server/drivers/irtrans.h 26 Oct 2008 21:33:10 -0000 1.1
+++ server/drivers/irtrans.h 18 Mar 2011 23:11:56 -0000
@@ -31,8 +31,6 @@
#ifndef LCD_TEXT_H
#define LCD_TEXT_H
-#include "lcd.h"
-
MODULE_EXPORT int irtrans_init(Driver *drvthis);
MODULE_EXPORT void irtrans_close(Driver *drvthis);
MODULE_EXPORT int irtrans_width(Driver *drvthis);
Index: server/drivers/joy.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/joy.c,v
retrieving revision 1.26
diff -u -r1.26 joy.c
--- server/drivers/joy.c 30 Oct 2010 18:04:22 -0000 1.26
+++ server/drivers/joy.c 18 Mar 2011 23:11:57 -0000
@@ -23,7 +23,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
Index: server/drivers/lcd_lib.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/lcd_lib.c,v
retrieving revision 1.16
diff -u -r1.16 lcd_lib.c
--- server/drivers/lcd_lib.c 30 Oct 2010 18:04:22 -0000 1.16
+++ server/drivers/lcd_lib.c 18 Mar 2011 23:11:57 -0000
@@ -8,10 +8,6 @@
* the height of hbars, etc.
*/
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-
#include "lcd.h"
#ifdef HAVE_CONFIG_H
Index: server/drivers/lcdm001.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/lcdm001.c,v
retrieving revision 1.35
diff -u -r1.35 lcdm001.c
--- server/drivers/lcdm001.c 10 Feb 2011 22:48:57 -0000 1.35
+++ server/drivers/lcdm001.c 18 Mar 2011 23:11:58 -0000
@@ -37,7 +37,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/lircin.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/lircin.c,v
retrieving revision 1.22
diff -u -r1.22 lircin.c
--- server/drivers/lircin.c 17 Oct 2009 19:19:10 -0000 1.22
+++ server/drivers/lircin.c 18 Mar 2011 23:11:59 -0000
@@ -33,7 +33,6 @@
#include <errno.h>
#include <sys/ioctl.h>
#include <sys/types.h>
-#include <errno.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/un.h>
@@ -101,7 +100,7 @@
if (drvthis->config_get_string(drvthis->name, "lircrc", 0 , NULL) != NULL) {
strncpy(s, drvthis->config_get_string(drvthis->name, "lircrc", 0, ""), sizeof(s));
s[sizeof(s)-1] = '\0';
- }
+ }
if (*s != '\0') {
p->lircrc = malloc(strlen(s) + 1);
@@ -185,7 +184,7 @@
if (p->lircin_fd >= 0) {
lirc_deinit ();
close (p->lircin_fd);
- }
+ }
p->lircin_fd = -1;
free(p);
Index: server/drivers/lis.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/lis.c,v
retrieving revision 1.10
diff -u -r1.10 lis.c
--- server/drivers/lis.c 14 Dec 2010 05:46:02 -0000 1.10
+++ server/drivers/lis.c 18 Mar 2011 23:12:03 -0000
@@ -52,21 +52,17 @@
* 2007/11/01 Change Linux-centric clone() to POSIX
* threads for portability.
*/
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#include <pthread.h>
#include <usb.h>
#include <ftdi.h>
-#include <sys/syscall.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Index: server/drivers/lis.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/lis.h,v
retrieving revision 1.6
diff -u -r1.6 lis.h
--- server/drivers/lis.h 6 Jan 2011 10:59:19 -0000 1.6
+++ server/drivers/lis.h 18 Mar 2011 23:12:03 -0000
@@ -19,8 +19,6 @@
#ifndef LIS_H
#define LIS_H
-#include "lcd.h"
-
#ifndef bool
# define bool short
# define true 1
Index: server/drivers/ms6931.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/ms6931.c,v
retrieving revision 1.18
diff -u -r1.18 ms6931.c
--- server/drivers/ms6931.c 30 Oct 2010 18:04:22 -0000 1.18
+++ server/drivers/ms6931.c 18 Mar 2011 23:12:05 -0000
@@ -24,34 +24,36 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 */
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <termios.h>
#include <fcntl.h>
-#include <time.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#ifdef TIME_WITH_SYS_TIME
+#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 "ms6931.h"
#include "report.h"
#include "lcd_lib.h"
-/*
-#include "server/configfile.h"
-*/
/** private data for the \c ms6931 driver */
typedef struct ms6931_private_data {
Index: server/drivers/ms6931.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/ms6931.h,v
retrieving revision 1.6
diff -u -r1.6 ms6931.h
--- server/drivers/ms6931.h 2 Apr 2007 21:29:54 -0000 1.6
+++ server/drivers/ms6931.h 18 Mar 2011 23:12:05 -0000
@@ -25,8 +25,6 @@
#ifndef MS6931_H
#define MS6931_H
-#include "lcd.h"
-
#define MS6931_DEF_DEVICE "/dev/ttyS1"
#define MS6931_DEF_SIZE "16x2"
#define MS6931_DEF_CELL_WIDTH 5
Index: server/drivers/mtc_s16209x.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/mtc_s16209x.c,v
retrieving revision 1.16
diff -u -r1.16 mtc_s16209x.c
--- server/drivers/mtc_s16209x.c 13 Feb 2011 21:19:44 -0000 1.16
+++ server/drivers/mtc_s16209x.c 18 Mar 2011 23:12:07 -0000
@@ -50,8 +50,6 @@
#include <string.h>
#include <errno.h>
-#include <sys/file.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
Index: server/drivers/mtc_s16209x.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/mtc_s16209x.h,v
retrieving revision 1.7
diff -u -r1.7 mtc_s16209x.h
--- server/drivers/mtc_s16209x.h 13 Feb 2011 21:19:44 -0000 1.7
+++ server/drivers/mtc_s16209x.h 18 Mar 2011 23:12:07 -0000
@@ -38,8 +38,6 @@
#ifndef MTC_S16209X_H
#define MTC_S16209X_H
-#include "lcd.h"
-
MODULE_EXPORT int MTC_S16209X_init(Driver *drvthis);
MODULE_EXPORT void MTC_S16209X_close(Driver *drvthis);
MODULE_EXPORT int MTC_S16209X_width (Driver *drvthis);
Index: server/drivers/pylcd.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/pylcd.c,v
retrieving revision 1.34
diff -u -r1.34 pylcd.c
--- server/drivers/pylcd.c 13 Feb 2011 17:50:31 -0000 1.34
+++ server/drivers/pylcd.c 18 Mar 2011 23:12:12 -0000
@@ -25,6 +25,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
*/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/select.h>
@@ -35,11 +39,16 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#ifdef HAVE_CONFIG_H
-# include "config.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
#include "shared/defines.h"
Index: server/drivers/sed1330.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/sed1330.c,v
retrieving revision 1.30
diff -u -r1.30 sed1330.c
--- server/drivers/sed1330.c 10 Feb 2011 22:55:45 -0000 1.30
+++ server/drivers/sed1330.c 18 Mar 2011 23:12:16 -0000
@@ -69,6 +69,7 @@
#include <string.h>
#include <errno.h>
#include <stdlib.h>
+#include <stdio.h>
#include "lcd.h"
#include "sed1330.h"
Index: server/drivers/sed1520.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/sed1520.c,v
retrieving revision 1.26
diff -u -r1.26 sed1520.c
--- server/drivers/sed1520.c 10 Feb 2011 23:03:04 -0000 1.26
+++ server/drivers/sed1520.c 18 Mar 2011 23:12:18 -0000
@@ -32,13 +32,8 @@
#endif
#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <time.h>
#include "lcd.h"
#include "sed1520.h"
Index: server/drivers/sed1520.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/sed1520.h,v
retrieving revision 1.8
diff -u -r1.8 sed1520.h
--- server/drivers/sed1520.h 10 Feb 2011 23:03:04 -0000 1.8
+++ server/drivers/sed1520.h 18 Mar 2011 23:12:18 -0000
@@ -1,8 +1,6 @@
#ifndef SED1520_H
#define SED1520_H
-#include "lcd.h"
-
/* Commands for SED1520 */
#define DISP_OFF 0xAE
#define DISP_ON 0xAF
Index: server/drivers/serialPOS.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/serialPOS.c,v
retrieving revision 1.15
diff -u -r1.15 serialPOS.c
--- server/drivers/serialPOS.c 5 Jan 2011 19:54:54 -0000 1.15
+++ server/drivers/serialPOS.c 18 Mar 2011 23:12:22 -0000
@@ -66,9 +66,7 @@
#include <string.h>
#include <strings.h>
#include <errno.h>
-#include <syslog.h>
#include <ctype.h>
-#include <sys/poll.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/serialPOS.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/serialPOS.h,v
retrieving revision 1.3
diff -u -r1.3 serialPOS.h
--- server/drivers/serialPOS.h 8 Oct 2008 17:01:03 -0000 1.3
+++ server/drivers/serialPOS.h 18 Mar 2011 23:12:22 -0000
@@ -1,8 +1,6 @@
#ifndef SERPOS_H
#define SERPOS_H
-#include "lcd.h"
-
#define DEFAULT_DEVICE "/dev/Stty"
#define DEFAULT_SPEED 9800
#define DEFAULT_LINEWRAP 0
Index: server/drivers/serialVFD.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/serialVFD.c,v
retrieving revision 1.27
diff -u -r1.27 serialVFD.c
--- server/drivers/serialVFD.c 6 Jan 2011 10:59:19 -0000 1.27
+++ server/drivers/serialVFD.c 18 Mar 2011 23:12:26 -0000
@@ -46,9 +46,7 @@
#include <stdio.h>
#include <unistd.h>
#include <termios.h>
-#include <fcntl.h>
#include <string.h>
-#include <errno.h>
#include "lcd.h"
#include "report.h"
@@ -422,7 +420,7 @@
}
}
/* line mode Display (partitially borrowed from serialPOS.c) */
- else {
+ else {
for (j = 0; j < p->height; j++) {
/* set pointers to start of the line in frame buffer
* & backing store */
@@ -652,7 +650,7 @@
*
* Converts the 5x7 matrix of bits stored in 7 bytes into a VFD specific
* byte sequence.
- *
+ *
* \param drvthis Pointer to driver structure.
* \param n Custom character to define [0 - (p->customchars)].
* \param dat Array of 7(=cellheight) bytes, each representing a pixel row
@@ -856,7 +854,7 @@
* ISO_8859_1 is enabled.
* \param drvthis Pointer to driver
* \param i Index of character in framebuffer to write
- *
+ *
*/
static void
serialVFD_hw_write (Driver *drvthis, int i)
Index: server/drivers/serialVFD_io.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/serialVFD_io.c,v
retrieving revision 1.10
diff -u -r1.10 serialVFD_io.c
--- server/drivers/serialVFD_io.c 9 Dec 2010 21:25:42 -0000 1.10
+++ server/drivers/serialVFD_io.c 18 Mar 2011 23:12:27 -0000
@@ -33,8 +33,6 @@
# include "config.h"
#endif
-#include <stdlib.h>
-#include <stdio.h>
#include <unistd.h>
#include <termios.h>
#include <fcntl.h>
@@ -84,7 +82,7 @@
* Portwait = 2; as 1 + additional WR pulse width\n
* Portwait = 3; as 2 + additional WR setup delay\n
* Portwait >= 4; as 3 + additional wait delay to next command
- *
+ *
* \param drvthis Pointer to driver
* \param dat Pointer to array storing the data
* \param length Number of bytes to write
Index: server/drivers/shuttleVFD.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/shuttleVFD.h,v
retrieving revision 1.4
diff -u -r1.4 shuttleVFD.h
--- server/drivers/shuttleVFD.h 30 Oct 2010 18:04:22 -0000 1.4
+++ server/drivers/shuttleVFD.h 18 Mar 2011 23:12:27 -0000
@@ -26,8 +26,6 @@
#ifndef SHUTTLE_VFD_H
#define SHUTTLE_VFD_H
-#include "lcd.h"
-
// mandatory functions (necessary for all drivers)
MODULE_EXPORT int shuttleVFD_init(Driver *drvthis);
MODULE_EXPORT void shuttleVFD_close(Driver *drvthis);
Index: server/drivers/stv5730.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/stv5730.c,v
retrieving revision 1.23
diff -u -r1.23 stv5730.c
--- server/drivers/stv5730.c 10 Feb 2011 22:48:57 -0000 1.23
+++ server/drivers/stv5730.c 18 Mar 2011 23:12:30 -0000
@@ -22,25 +22,21 @@
// package for further details. //
//////////////////////////////////////////////////////////////////////////
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <time.h>
-#include "port.h"
-#include "timing.h"
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
#include "lcd.h"
#include "stv5730.h"
#include "report.h"
-
+#include "port.h"
+#include "timing.h"
#ifndef LPTPORT
#define LPTPORT 0x378
Index: server/drivers/svgalib_drv.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/svgalib_drv.c,v
retrieving revision 1.27
diff -u -r1.27 svgalib_drv.c
--- server/drivers/svgalib_drv.c 17 Oct 2009 19:19:10 -0000 1.27
+++ server/drivers/svgalib_drv.c 18 Mar 2011 23:12:35 -0000
@@ -2,15 +2,12 @@
* LCDd \c svga driver for displaying on SVGA screens.
*/
-/*
+/*-
This is a hack of the curses driver. It's my first attempt at SVGALIB
programming so please send comments to <smh@[email protected]>.
Simon Harrison. 27 Dec 1999.
- IMPORTANT NOTE: In order to make this work properly LCDd should not be
- allowed to fork (-f option), otherwise k/b input won't work.
-
Changes:
9 Jan 2000: Figured out svgalib driver needs a hack to main.c just like
curses. Maybe this should be fixed with another function call
@@ -19,17 +16,12 @@
26 Jul 2005: adapted better to 0.5 API; changed font from 5x7 to 6x8;
take options from the config file: mode, size, brightness,
contrast, ...
-
*/
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
-#include <errno.h>
#include <vga.h>
#include <vgagl.h>
@@ -316,14 +308,14 @@
if (vga_init() != 0) {
report(RPT_ERR, "%s: vga_init() failed", drvthis->name);
return -1;
- }
+ }
/* check for legal VGA mode */
tmp = vga_getmodenumber(modestr);
if (tmp <= 0) {
report(RPT_ERR, "%s: illegal VGA mode %s", drvthis->name, modestr);
return -1;
- }
+ }
p->mode = tmp;
/* switch to selected VGA mode if it is available */
@@ -347,7 +339,7 @@
if (vga_setmode (p->mode) < 0) {
report(RPT_ERR, "%s: unable to switch to mode %s", drvthis->name, modestr);
return -1;
- }
+ }
gl_setcontextvga(p->mode); /* Physical screen context. */
gl_setrgbpalette();
@@ -356,7 +348,7 @@
if (p->font == NULL) {
report(RPT_ERR, "%s: unable to allocate font memory", drvthis->name);
return -1;
- }
+ }
tmp = (p->brightness * 255) / 1000;
if (tmp <= 0)
@@ -388,7 +380,7 @@
p->font = NULL;
free(p);
- }
+ }
drvthis->store_private_ptr(drvthis, NULL);
vga_setmode(TEXT);
@@ -614,8 +606,8 @@
/* otherwise key not recognised; ignore it */
return NULL;
case '\t': /* TAB, LF and CR serve as "Enter" */
- case 0x0A:
- case 0x0D:
+ case 0x0A:
+ case 0x0D:
return "Enter";
default:
buf[0] = (char) key & 0xFF; /* make sure it fits into a char */
Index: server/drivers/t6963.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/t6963.c,v
retrieving revision 1.34
diff -u -r1.34 t6963.c
--- server/drivers/t6963.c 27 Feb 2011 12:23:47 -0000 1.34
+++ server/drivers/t6963.c 18 Mar 2011 23:12:37 -0000
@@ -30,7 +30,6 @@
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <string.h>
#include <errno.h>
Index: server/drivers/text.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/text.c,v
retrieving revision 1.34
diff -u -r1.34 text.c
--- server/drivers/text.c 30 Oct 2010 18:04:22 -0000 1.34
+++ server/drivers/text.c 18 Mar 2011 23:12:38 -0000
@@ -27,14 +27,11 @@
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
#include <string.h>
#include "lcd.h"
#include "text.h"
#include "report.h"
-//#include "drv_base.h"
/** private data for the \c text driver */
Index: server/drivers/text.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/text.h,v
retrieving revision 1.13
diff -u -r1.13 text.h
--- server/drivers/text.h 10 Feb 2011 22:45:35 -0000 1.13
+++ server/drivers/text.h 18 Mar 2011 23:12:38 -0000
@@ -1,8 +1,6 @@
#ifndef LCD_TEXT_H
#define LCD_TEXT_H
-#include "lcd.h"
-
MODULE_EXPORT int text_init (Driver *drvthis);
MODULE_EXPORT void text_close (Driver *drvthis);
MODULE_EXPORT int text_width (Driver *drvthis);
Index: server/drivers/tyan_lcdm.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/tyan_lcdm.c,v
retrieving revision 1.16
diff -u -r1.16 tyan_lcdm.c
--- server/drivers/tyan_lcdm.c 5 Jan 2011 19:54:54 -0000 1.16
+++ server/drivers/tyan_lcdm.c 18 Mar 2011 23:12:40 -0000
@@ -41,7 +41,6 @@
#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#ifdef HAVE_CONFIG_H
# include "config.h"
Index: server/drivers/tyan_lcdm.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/tyan_lcdm.h,v
retrieving revision 1.9
diff -u -r1.9 tyan_lcdm.h
--- server/drivers/tyan_lcdm.h 6 Jan 2011 10:59:19 -0000 1.9
+++ server/drivers/tyan_lcdm.h 18 Mar 2011 23:12:40 -0000
@@ -20,8 +20,6 @@
#ifndef TYAN_LCDM_H
#define TYAN_LCDM_H
-#include "lcd.h"
-
#define DEFAULT_CELL_WIDTH 5
#define DEFAULT_CELL_HEIGHT 8
#define DEFAULT_DEVICE "/dev/lcd"
@@ -54,10 +52,10 @@
char device[200];
int speed;
int fd;
-
+
unsigned char *framebuf;
unsigned char *backingstore;
-
+
int width;
int height;
int cellwidth;
@@ -66,7 +64,7 @@
/* defineable characters */
CGram cc[NUM_CCs];
CGmode ccmode;
-} PrivateData;
+} PrivateData;
/* API: variables for the server core */
Index: server/drivers/ula200.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/ula200.c,v
retrieving revision 1.18
diff -u -r1.18 ula200.c
--- server/drivers/ula200.c 27 Feb 2011 14:02:58 -0000 1.18
+++ server/drivers/ula200.c 18 Mar 2011 23:12:43 -0000
@@ -27,11 +27,8 @@
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
-#include <termios.h>
-#include <fcntl.h>
#include <string.h>
#include <errno.h>
-#include <syslog.h>
#include <usb.h>
#include <ftdi.h>
Index: server/drivers/wirz-sli.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/wirz-sli.h,v
retrieving revision 1.12
diff -u -r1.12 wirz-sli.h
--- server/drivers/wirz-sli.h 13 Feb 2011 21:19:44 -0000 1.12
+++ server/drivers/wirz-sli.h 18 Mar 2011 23:12:43 -0000
@@ -7,8 +7,6 @@
#ifndef SLI_H
#define SLI_H
-#include "lcd.h"
-
MODULE_EXPORT int sli_init (Driver *drvthis);
MODULE_EXPORT void sli_close (Driver *drvthis);
MODULE_EXPORT int sli_width (Driver *drvthis);
Index: server/drivers/xosdlib_drv.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/server/drivers/xosdlib_drv.c,v
retrieving revision 1.13
diff -u -r1.13 xosdlib_drv.c
--- server/drivers/xosdlib_drv.c 30 Oct 2010 18:04:22 -0000 1.13
+++ server/drivers/xosdlib_drv.c 18 Mar 2011 23:12:45 -0000
@@ -27,7 +27,6 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <termios.h>
#include <fcntl.h>
#include <string.h>
Index: shared/report.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/shared/report.h,v
retrieving revision 1.9
diff -u -r1.9 report.h
--- shared/report.h 27 Feb 2011 11:31:42 -0000 1.9
+++ shared/report.h 18 Mar 2011 23:12:46 -0000
@@ -32,9 +32,6 @@
#ifndef REPORT_H
#define REPORT_H
-#include <stdarg.h>
-#include <stdio.h>
-
/* Reporting levels */
/**
* \def RPT_CRIT
Index: shared/sockets.c
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/shared/sockets.c,v
retrieving revision 1.24
diff -u -r1.24 sockets.c
--- shared/sockets.c 10 Apr 2010 18:07:19 -0000 1.24
+++ shared/sockets.c 18 Mar 2011 23:12:47 -0000
@@ -234,7 +234,6 @@
if (errno != EAGAIN) {
report (RPT_ERR, "sock_send: socket write error");
report (RPT_DEBUG, "Message was: '%.*s'", size-offset, (char *) src);
- //shutdown(fd, SHUT_RDWR);
return sent;
}
continue;
@@ -270,7 +269,6 @@
err = read (fd, dest, maxlen);
if (err < 0) {
//report (RPT_DEBUG,"sock_recv: socket read error");
- //shutdown(fd, SHUT_RDWR);
return err;
}
//debug(RPT_DEBUG, "sock_recv: Got message \"%s\"", (char *)dest);
Index: shared/sockets.h
===================================================================
RCS file: /cvsroot/lcdproc/lcdproc/shared/sockets.h,v
retrieving revision 1.8
diff -u -r1.8 sockets.h
--- shared/sockets.h 2 Feb 2010 23:20:29 -0000 1.8
+++ shared/sockets.h 18 Mar 2011 23:12:50 -0000
@@ -5,8 +5,6 @@
#ifndef SOCKETS_H
#define SOCKETS_H
-#include <stdlib.h>
-
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif