[lcd4linux @ 2004-01-30 20:57:55 by reinelt]

HD44780 patch from Martin Hejl
dmalloc integrated

git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@348 3ae390bd-cb1e-0410-b409-cd5a39f66f1f

diff --git a/BeckmannEgle.c b/BeckmannEgle.c
index 806364a0823816ea19272911ff4d60da6aadb8b8..1969d787096bfdf74193ffca816c6a14a60baa74 100644 (file)
--- a/BeckmannEgle.c
+++ b/BeckmannEgle.c
@@ -1,4 +1,4 @@
-/* $Id: BeckmannEgle.c,v 1.19 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: BeckmannEgle.c,v 1.20 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for Beckmann+Egle mini terminals
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: BeckmannEgle.c,v $
+ * Revision 1.20  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.19  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -113,6 +117,10 @@
 #include "bar.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 5
 #define YRES 8
 #define CHARS 8

diff --git a/Crystalfontz.c b/Crystalfontz.c
index 4bc2d32400c587e8a8daa6be5f35290cbbb12ae5..9b9dbc7cfb0b6ff26f03f89d90815f827c0c8063 100644 (file)
--- a/Crystalfontz.c
+++ b/Crystalfontz.c
@@ -1,4 +1,4 @@
-/* $Id: Crystalfontz.c,v 1.19 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: Crystalfontz.c,v 1.20 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for display modules from Crystalfontz
  *
@@ -21,6 +21,10 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Log: Crystalfontz.c,v $
+ * Revision 1.20  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.19  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -101,6 +105,10 @@
 #include "bar.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 6
 #define YRES 8
 #define CHARS 8

diff --git a/Cwlinux.c b/Cwlinux.c
index a8e3e67caaa969cf622467b41c3392389e609de2..30f181bb283785d6f9d751d13571fe0727848549 100644 (file)
--- a/Cwlinux.c
+++ b/Cwlinux.c
@@ -1,4 +1,4 @@
-/* $Id: Cwlinux.c,v 1.18 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: Cwlinux.c,v 1.19 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for Cwlinux serial display modules
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: Cwlinux.c,v $
+ * Revision 1.19  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.18  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -103,6 +107,10 @@
 #include "bar.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define CHARS 8
 
 static LCD Lcd;

diff --git a/HD44780.c b/HD44780.c
index f4a085083c8d5d098ac7d8ec00c77dc4ad4d5353..5995aebca1fb0e56faf4f88711dd460a4664b0a5 100644 (file)
--- a/HD44780.c
+++ b/HD44780.c
@@ -1,4 +1,4 @@
-/* $Id: HD44780.c,v 1.49 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: HD44780.c,v 1.50 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for display modules based on the HD44780 chip
  *
@@ -28,6 +28,10 @@
  *
  *
  * $Log: HD44780.c,v $
+ * Revision 1.50  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.49  2004/01/09 04:16:06  reinelt
  * added 'section' argument to cfg_get(), but NULLed it on all calls by now.
  *
@@ -239,6 +243,10 @@
 #include "parport.h"
 #include "udelay.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 5
 #define YRES 8
 #define CHARS 8

diff --git a/M50530.c b/M50530.c
index ec206e1cce68bec39dc7856cded86bedc0c1e6b8..eec199d7c62db726363dd3325ea9580dd8ca75cf 100644 (file)
--- a/M50530.c
+++ b/M50530.c
@@ -1,4 +1,4 @@
-/* $Id: M50530.c,v 1.17 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: M50530.c,v 1.18 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for display modules based on the M50530 chip
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: M50530.c,v $
+ * Revision 1.18  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.17  2004/01/09 04:16:06  reinelt
  * added 'section' argument to cfg_get(), but NULLed it on all calls by now.
  *
@@ -100,6 +104,10 @@
 #include "parport.h"
 #include "udelay.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 5
 #define YRES 8
 #define CHARS 8

diff --git a/MatrixOrbital.c b/MatrixOrbital.c
index b69cc3d069fd208844535a1b5f3252161725fb02..2035283c08962d3a3329ffa7e972a52693500ef3 100644 (file)
--- a/MatrixOrbital.c
+++ b/MatrixOrbital.c
@@ -1,4 +1,4 @@
-/* $Id: MatrixOrbital.c,v 1.51 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: MatrixOrbital.c,v 1.52 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for Matrix Orbital serial display modules
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: MatrixOrbital.c,v $
+ * Revision 1.52  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.51  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -244,6 +248,10 @@
 #include "bar.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 5
 #define YRES 8
 #define CHARS 8

diff --git a/MilfordInstruments.c b/MilfordInstruments.c
index 577d15d8b1df332d3271d0ee8f204e807cffe2d7..e2fa294a429c88ec30985838c8fd2a56cecf0899 100644 (file)
--- a/MilfordInstruments.c
+++ b/MilfordInstruments.c
@@ -1,4 +1,4 @@
-/* $Id: MilfordInstruments.c,v 1.6 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: MilfordInstruments.c,v 1.7 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for Milford Instruments 'BPK' piggy-back serial interface board
  * for standard Hitachi 44780 compatible lcd modules.
@@ -24,6 +24,10 @@
  *
  *
  * $Log: MilfordInstruments.c,v $
+ * Revision 1.7  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.6  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -66,6 +70,10 @@
 #include "bar.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define XRES 5
 #define YRES 8
 #define CHARS 8

diff --git a/PalmPilot.c b/PalmPilot.c
index 8fd93940cb96fe7e17b1d18e5de17ee30c874166..c0c6bcf76e2ec5a039d554e16bb19a965645d4cd 100644 (file)
--- a/PalmPilot.c
+++ b/PalmPilot.c
@@ -1,4 +1,4 @@
-/* $Id: PalmPilot.c,v 1.16 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: PalmPilot.c,v 1.17 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for 3Com Palm Pilot
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: PalmPilot.c,v $
+ * Revision 1.17  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.16  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -111,6 +115,10 @@
 #include "icon.h"
 #include "pixmap.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 static LCD Lcd;
 static char *Port=NULL;

diff --git a/Raster.c b/Raster.c
index b443b561605db8d5d3f3436235c5ba67dbc2755f..b0587a6183eca3ec67b14bcf42fde0f3b4b16084 100644 (file)
--- a/Raster.c
+++ b/Raster.c
@@ -1,4 +1,4 @@
-/* $Id: Raster.c,v 1.29 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: Raster.c,v 1.30 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for raster formats
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: Raster.c,v $
+ * Revision 1.30  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.29  2004/01/09 04:16:06  reinelt
  * added 'section' argument to cfg_get(), but NULLed it on all calls by now.
  *
@@ -172,6 +176,10 @@
 #include "icon.h"
 #include "pixmap.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 static LCD Lcd;
 
 static int pixel=-1;

diff --git a/T6963.c b/T6963.c
index 37d341295d1a0dbfd9dd58b13c17f7cd86a99ba7..a8f98d083a5e589c447b9da0400222ddb444b5ef 100644 (file)
--- a/T6963.c
+++ b/T6963.c
@@ -1,4 +1,4 @@
-/* $Id: T6963.c,v 1.14 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: T6963.c,v 1.15 2004/01/30 20:57:55 reinelt Exp $
  *
  * driver for display modules based on the Toshiba T6963 chip
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: T6963.c,v $
+ * Revision 1.15  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.14  2004/01/09 04:16:06  reinelt
  * added 'section' argument to cfg_get(), but NULLed it on all calls by now.
  *
@@ -93,6 +97,10 @@
 #include "udelay.h"
 #include "pixmap.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 #define XRES 6
 #define YRES 8

diff --git a/USBLCD.c b/USBLCD.c
index 0896abb0fe0a067fd13507fa84493a1b980e037e..63eb7b4afa25007f15587eaa91805bc3a21529ae 100644 (file)
--- a/USBLCD.c
+++ b/USBLCD.c
@@ -1,4 +1,4 @@
-/* $Id: USBLCD.c,v 1.20 2004/01/09 04:16:06 reinelt Exp $
+/* $Id: USBLCD.c,v 1.21 2004/01/30 20:57:55 reinelt Exp $
  *
  * Driver for USBLCD (see http://www.usblcd.de)
  *
@@ -25,6 +25,10 @@
  *
  *
  * $Log: USBLCD.c,v $
+ * Revision 1.21  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.20  2004/01/09 04:16:06  reinelt
  * added 'section' argument to cfg_get(), but NULLed it on all calls by now.
  *
@@ -120,6 +124,10 @@
 #include "icon.h"
 #include "bar.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define GET_HARD_VERSION       1
 #define GET_DRV_VERSION                2
 

diff --git a/XWindow.c b/XWindow.c
index 024d1394c8c100be4ab5c37d8b1f209b02b42604..c7ead72518bbdd68c87b159d1cd98f2b6c7f3ed2 100644 (file)
--- a/XWindow.c
+++ b/XWindow.c
@@ -1,4 +1,4 @@
-/* $Id: XWindow.c,v 1.39 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: XWindow.c,v 1.40 2004/01/30 20:57:55 reinelt Exp $
  *
  * X11 Driver for LCD4Linux 
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: XWindow.c,v $
+ * Revision 1.40  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.39  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -190,6 +194,10 @@
 #include        "icon.h"
 #include       "pixmap.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 /* glibc 2.1 requires defining semun ourselves */
 #ifdef _SEM_SEMUN_UNDEFINED

diff --git a/aclocal.m4 b/aclocal.m4
index b62dd682aee928067c0e682356004c1eeb0660e1..ec6d6e4a8bd63f5b17eb394671230387a022f51c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6883,3 +6883,22 @@ SED=$lt_cv_path_SED
 AC_MSG_RESULT([$SED])
 ])
 
+
+# serial 1
+
+AC_DEFUN([AM_WITH_DMALLOC],
+[AC_MSG_CHECKING(if malloc debugging is wanted)
+AC_ARG_WITH(dmalloc,
+[  --with-dmalloc          use dmalloc, as in
+                          ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz],
+[if test "$withval" = yes; then
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(WITH_DMALLOC,1,
+            [Define if using the dmalloc debugging malloc package])
+  LIBS="$LIBS -ldmalloc"
+  LDFLAGS="$LDFLAGS -g"
+else
+  AC_MSG_RESULT(no)
+fi], [AC_MSG_RESULT(no)])
+])
+

diff --git a/bar.c b/bar.c
index 6736882f173f1e2d0cd87d7d9b45c5ff58884573..b1ccacb125201f553007b5202e1450e2fdff8744 100644 (file)
--- a/bar.c
+++ b/bar.c
@@ -1,4 +1,4 @@
-/* $Id: bar.c,v 1.10 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: bar.c,v 1.11 2004/01/30 20:57:55 reinelt Exp $
  *
  * generic bar handling
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: bar.c,v $
+ * Revision 1.11  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.10  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -80,6 +84,10 @@
 #include "bar.h"
 #include "debug.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 static int ROWS=0;
 static int COLS=0;

diff --git a/cfg.c b/cfg.c
index 7fe34bf91771275654cbf20312f7bffc81b01824..0593c3684df9a53d4607c0339c6de21e0925ede5 100644 (file)
--- a/cfg.c
+++ b/cfg.c
@@ -1,4 +1,4 @@
-/* $Id: cfg.c,v 1.31 2004/01/29 04:40:02 reinelt Exp $^
+/* $Id: cfg.c,v 1.32 2004/01/30 20:57:55 reinelt Exp $^
  *
  * config file stuff
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: cfg.c,v $
+ * Revision 1.32  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.31  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -219,6 +223,10 @@
 #include "evaluator.h"
 #include "cfg.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 typedef struct {
   char *key;
   char *val;
@@ -335,7 +343,7 @@ static void cfg_add (char *section, char *key, char *val, int lock)
   
   nConfig++;
   Config=realloc(Config, nConfig*sizeof(ENTRY));
-  Config[nConfig-1].key=strdup(buffer);
+  Config[nConfig-1].key=buffer;
   Config[nConfig-1].val=dequote(strdup(val));
   Config[nConfig-1].lock=lock;
 
@@ -700,6 +708,29 @@ char *l4l_cfg_source (void)
 }
 
 
+int l4l_cfg_exit (void)
+{
+  int i;
+  
+  for (i=0; i<nConfig; i++) {
+    if (Config[i].key) free (Config[i].key);
+    if (Config[i].val) free (Config[i].val);
+  }
+  
+  if (Config) {
+    free (Config);
+    Config=NULL;
+  }
+
+  if (Config_File) {
+    free (Config_File);
+    Config_File=NULL;
+  }
+  
+  return 0;
+}
+
+
 int   (*cfg_init)    (char *source)                           = l4l_cfg_init;
 char *(*cfg_source)  (void)                                   = l4l_cfg_source;
 int   (*cfg_cmd)     (char *arg)                              = l4l_cfg_cmd;
@@ -708,3 +739,4 @@ char *(*cfg_get_raw) (char *section, char *key, char *defval) = l4l_cfg_get_raw;
 char *(*cfg_get)     (char *section, char *key, char *defval) = l4l_cfg_get;
 int   (*cfg_number)  (char *section, char *key, int   defval, 
                      int min, int max, int *value)           = l4l_cfg_number;
+int   (*cfg_exit)    (void)                                   = l4l_cfg_exit;

diff --git a/cfg.h b/cfg.h
index ffd01f695f6a0e334d36319ab6a87676845ac2d2..2a43eed050d8832f0c1e51bb123197458c575fce 100644 (file)
--- a/cfg.h
+++ b/cfg.h
@@ -1,4 +1,4 @@
-/* $Id: cfg.h,v 1.9 2004/01/14 11:33:00 reinelt Exp $
+/* $Id: cfg.h,v 1.10 2004/01/30 20:57:55 reinelt Exp $
  *
  * config file stuff
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: cfg.h,v $
+ * Revision 1.10  2004/01/30 20:57:55  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.9  2004/01/14 11:33:00  reinelt
  * new plugin 'uname' which does what it's called
  * text widget nearly finished
@@ -73,6 +77,7 @@ extern char *(*cfg_get_raw) (char *section, char *key, char *defval);
 extern char *(*cfg_get)     (char *section, char *key, char *defval);
 extern int   (*cfg_number)  (char *section, char *key, int   defval, 
                             int min, int max, int *value);
+extern int   (*cfg_exit)    (void);
 
 int   l4l_cfg_init    (char *file);
 char *l4l_cfg_source  (void);
@@ -82,5 +87,6 @@ char *l4l_cfg_get_raw (char *section, char *key, char *defval);
 char *l4l_cfg_get     (char *section, char *key, char *defval);
 int   l4l_cfg_number  (char *section, char *key, int   defval, 
                       int min, int max, int *value);
+int   l4l_cfg_exit    (void);
 
 #endif

diff --git a/config.h.in b/config.h.in
index 32e14b2c7a7e1b0205bd641731f810f81dc2b653..bb8b87f7b4f9eef2edbe16c389b2565b201fe237 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -281,6 +281,9 @@
 /* junk */
 #undef WITH_CWLINUX
 
+/* Define if using the dmalloc debugging malloc package */
+#undef WITH_DMALLOC
+
 /* junk */
 #undef WITH_HD44780
 

diff --git a/configure b/configure
index 28139d18f629cdf0ef22e64ccdf75d21e1124b53..969c17eab18e0224ce02f9bb16673e382550897a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1047,6 +1047,8 @@ Optional Packages:
                           both]
   --with-tags[=TAGS]
                           include additional configurations [automatic]
+  --with-dmalloc          use dmalloc, as in
+                          ftp://ftp.letters.com/src/dmalloc/dmalloc.tar.gz
   --with-sco              Use this to turn on SCO-specific code
   --with-sunos-curses     Used to force SunOS 4.x curses
   --with-osf1-curses      Used to force OSF/1 curses
@@ -4044,7 +4046,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4047 "configure"' > conftest.$ac_ext
+  echo '#line 4049 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4914,7 +4916,7 @@ fi
 
 
 # Provide some information about the compiler.
-echo "$as_me:4917:" \
+echo "$as_me:4919:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -5946,11 +5948,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:5949: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:5951: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:5953: \$? = $ac_status" >&5
+   echo "$as_me:5955: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6179,11 +6181,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6182: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6184: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6186: \$? = $ac_status" >&5
+   echo "$as_me:6188: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -6246,11 +6248,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6249: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6251: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:6253: \$? = $ac_status" >&5
+   echo "$as_me:6255: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8421,7 +8423,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8424 "configure"
+#line 8426 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -8519,7 +8521,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 8522 "configure"
+#line 8524 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10696,11 +10698,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10699: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10701: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10703: \$? = $ac_status" >&5
+   echo "$as_me:10705: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -10763,11 +10765,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10766: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10768: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10770: \$? = $ac_status" >&5
+   echo "$as_me:10772: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12117,7 +12119,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12120 "configure"
+#line 12122 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12215,7 +12217,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12218 "configure"
+#line 12220 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13042,11 +13044,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13045: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13047: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13049: \$? = $ac_status" >&5
+   echo "$as_me:13051: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -13109,11 +13111,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13112: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13114: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13116: \$? = $ac_status" >&5
+   echo "$as_me:13118: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15141,11 +15143,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15144: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15146: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15148: \$? = $ac_status" >&5
+   echo "$as_me:15150: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15374,11 +15376,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15377: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15379: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15381: \$? = $ac_status" >&5
+   echo "$as_me:15383: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15441,11 +15443,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15444: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15446: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15448: \$? = $ac_status" >&5
+   echo "$as_me:15450: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17616,7 +17618,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17619 "configure"
+#line 17621 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17714,7 +17716,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17717 "configure"
+#line 17719 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18728,6 +18730,33 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
 
 
 
+
+# dmalloc
+echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
+echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6
+
+# Check whether --with-dmalloc or --without-dmalloc was given.
+if test "${with_dmalloc+set}" = set; then
+  withval="$with_dmalloc"
+  if test "$withval" = yes; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+
+cat >>confdefs.h <<\_ACEOF
+#define WITH_DMALLOC 1
+_ACEOF
+
+  LIBS="$LIBS -ldmalloc"
+  LDFLAGS="$LDFLAGS -g"
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi;
+
 
 # Checks for libraries.
 
@@ -19253,7 +19282,7 @@ echo "${ECHO_T}Please note that some screen refreshs may fail" >&6
 echo $ECHO_N "checking for ncurses version... $ECHO_C" >&6
        ncurses_version=unknown
 cat > conftest.$ac_ext <<EOF
-#line 19256 "configure"
+#line 19285 "configure"
 #include "confdefs.h"
 #ifdef RENAMED_NCURSES
 #include <curses.h>

diff --git a/configure.in b/configure.in
index 652386d8dd79420eba5b736433713a8f853a7bc8..821f24502ce650da6729e8b1769d42e363e83c1f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -19,6 +19,9 @@ AC_PROG_MAKE_SET
 #AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 
+# dmalloc
+AM_WITH_DMALLOC
+
 # Checks for libraries.
 AC_CHECK_LIB(m, log)
 

diff --git a/drv_Crystalfontz.c b/drv_Crystalfontz.c
index 65b3293b739d8ba257675ac5740658c168c905b4..232d1d45bef6f06282ba34976b9eb4f8d14b81b2 100644 (file)
--- a/drv_Crystalfontz.c
+++ b/drv_Crystalfontz.c
@@ -1,4 +1,4 @@
-/* $Id: drv_Crystalfontz.c,v 1.6 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: drv_Crystalfontz.c,v 1.7 2004/01/30 20:57:56 reinelt Exp $
  *
  * new style driver for Crystalfontz display modules
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_Crystalfontz.c,v $
+ * Revision 1.7  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.6  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -109,6 +113,52 @@ static MODEL Models[] = {
 // ***  hardware dependant functions    ***
 // ****************************************
 
+// x^0 + x^5 + x^12
+#define CRCPOLY 0x8408 
+
+static unsigned short CRC=0xffff;
+
+static unsigned short CRC16 (unsigned short crc, unsigned char *p, size_t len)
+{
+  int i;
+  while (len--) {
+    crc ^= *p++;
+    for (i = 0; i < 8; i++)
+      crc = (crc >> 1) ^ ((crc & 1) ? CRCPOLY : 0);
+  }
+  return ~crc;
+}
+
+
+static void drv_CF_write_crc (char *string, int len)
+{
+  unsigned char buffer[16+2];
+  
+  if (len>sizeof(buffer)-2) {
+    error ("%s: internal error: packet length %d exceeds buffer size %d", Name, len, sizeof(buffer)-2);
+    len=sizeof(buffer)-1;
+  }
+  
+  strcpy (buffer, string);
+  CRC = CRC16(CRC, buffer, len);
+  buffer[len]   = (CRC >> 8);
+  buffer[len+1] =  CRC & 0xff;
+}
+
+
+static void drv_CF_write (char *string, int len)
+{
+  switch (Protocol) {
+  case 1:
+    drv_generic_serial_write (string, len);
+    break;
+  case 2:
+    drv_CF_write_crc (string, len);
+    break;
+  }
+}
+
+
 static void drv_CF_goto (int row, int col)
 {
   char cmd[3]="\021xy"; // set cursor position
@@ -151,20 +201,22 @@ static int drv_CF_start (char *section)
     }
     Model=i;
     info ("%s: using model '%s'", Name, Models[Model].name);
+    Protocol = Models[Model].protocol;
   } else {
     info ("%s: no '%s.Model' entry from %s, auto-dedecting", Name, section, cfg_source());
     Model=-1;
+    Protocol=2; //auto-dedect only newer displays
   }
   
   // open serial port
   if (drv_generic_serial_open(section, Name)<0) return -1;
-
+  
   // MR: why such a large delay?
   usleep(350*1000);
-
+  
   // read display type
   memset(buffer, 0, sizeof(buffer));
-  drv_generic_serial_write ("\1", 2);
+  drv_CF_write ("\1", 2);
   usleep(250*1000);
 #if 1
   {

diff --git a/drv_generic_text.c b/drv_generic_text.c
index ff7b5aed1561f436f8eb672f4994702825d65f78..8c9fe05dd3232219bd0e1ad588ff8cb8e36caa18 100644 (file)
--- a/drv_generic_text.c
+++ b/drv_generic_text.c
@@ -1,4 +1,4 @@
-/* $Id: drv_generic_text.c,v 1.7 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: drv_generic_text.c,v 1.8 2004/01/30 20:57:56 reinelt Exp $
  *
  * generic driver helper for text-based displays
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: drv_generic_text.c,v $
+ * Revision 1.8  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.7  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -78,6 +82,10 @@
 #include "drv.h"
 #include "drv_generic_text.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 typedef struct {
   int val1;

diff --git a/evaluator.c b/evaluator.c
index 8300943e67ee3abd0ded1ecc03ae6425ce96056c..61f696c5d1359e4511c10d591c7a927bfd1f90a1 100644 (file)
--- a/evaluator.c
+++ b/evaluator.c
@@ -1,4 +1,4 @@
-/* $Id: evaluator.c,v 1.10 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: evaluator.c,v 1.11 2004/01/30 20:57:56 reinelt Exp $
  *
  * expression evaluation
  *
@@ -10,6 +10,10 @@
  * FIXME: GPL or not GPL????
  *
  * $Log: evaluator.c,v $
+ * Revision 1.11  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.10  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -132,6 +136,10 @@
 #include "debug.h"
 #include "evaluator.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 // Token types
 #define T_DELIMITER 1
@@ -871,6 +879,10 @@ int Eval (char* expression, RESULT *result)
   
   if ((err=setjmp(jb))) {
     error ("Evaluator: %s in expression <%s>", ErrMsg[err], expression);
+    if (Token) {
+      free (Token);
+      Token=NULL;
+    }
     return -1;
   }
   
@@ -892,5 +904,8 @@ int Eval (char* expression, RESULT *result)
   if (*Token=='\0') ERROR (E_EMPTY);
   Level01(result);
   if (*Token!='\0') ERROR (E_SYNTAX);
+  free (Token);
+  Token=NULL;
+  
   return 0;
 }

diff --git a/filter.c b/filter.c
index d2d5fde21ae8b2736ac48a0a635b0589041cd463..11b198b521457754b7cf2eafb1aabd504c9b9246 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -1,4 +1,4 @@
-/* $Id: filter.c,v 1.11 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: filter.c,v 1.12 2004/01/30 20:57:56 reinelt Exp $
  *
  *  smooth and damp functions
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: filter.c,v $
+ * Revision 1.12  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.11  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -87,6 +91,10 @@
 #include "cfg.h"
 #include "filter.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 extern int tick;
 
 #define SLOTS 64

diff --git a/hash.c b/hash.c
index ac5316e4e45ca1daea5f03af534ff51dcc9885e7..44152c62ea2a6c6687dba7775e501498d2065696 100644 (file)
--- a/hash.c
+++ b/hash.c
@@ -1,4 +1,4 @@
-/* $Id: hash.c,v 1.11 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: hash.c,v 1.12 2004/01/30 20:57:56 reinelt Exp $
  *
  * hashes (associative arrays)
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: hash.c,v $
+ * Revision 1.12  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.11  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -87,6 +91,10 @@
 #include "debug.h"
 #include "hash.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 #define DELTA_SLOTS 64
 

diff --git a/icon.c b/icon.c
index 92cf352c7ade871f7667c86c06c978c3bfd289c8..c41ce9a893c0fd8aa2ad82f4f1a5cd62c88f84db 100644 (file)
--- a/icon.c
+++ b/icon.c
@@ -1,4 +1,4 @@
-/* $Id: icon.c,v 1.13 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: icon.c,v 1.14 2004/01/30 20:57:56 reinelt Exp $
  *
  * generic icon and heartbeat handling
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: icon.c,v $
+ * Revision 1.14  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.13  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -93,6 +97,10 @@
 #include "cfg.h"
 #include "icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 typedef struct BITMAP {
   int  nData;

diff --git a/layout.c b/layout.c
index 4f25a7dba583a82c5b10b645b3b751668befdb61..01ff9ed0add17878affc09c4a6e744fde50ce2d5 100644 (file)
--- a/layout.c
+++ b/layout.c
@@ -1,4 +1,4 @@
-/* $Id: layout.c,v 1.6 2004/01/14 11:33:00 reinelt Exp $
+/* $Id: layout.c,v 1.7 2004/01/30 20:57:56 reinelt Exp $
  *
  * new layouter framework
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: layout.c,v $
+ * Revision 1.7  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.6  2004/01/14 11:33:00  reinelt
  * new plugin 'uname' which does what it's called
  * text widget nearly finished
@@ -69,6 +73,10 @@
 #include "widget.h"
 #include "layout.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 int layout_addItem (char *name, int row, int col)
 {

diff --git a/lcd4linux.c b/lcd4linux.c
index 76d1f55f6adc283f1aa6b7c99523658c239aa832..409895e10bbb937adb8fb80ffdcf326abee48839 100644 (file)
--- a/lcd4linux.c
+++ b/lcd4linux.c
@@ -1,4 +1,4 @@
-/* $Id: lcd4linux.c,v 1.61 2004/01/14 11:33:00 reinelt Exp $
+/* $Id: lcd4linux.c,v 1.62 2004/01/30 20:57:56 reinelt Exp $
  *
  * LCD4Linux
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: lcd4linux.c,v $
+ * Revision 1.62  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.61  2004/01/14 11:33:00  reinelt
  * new plugin 'uname' which does what it's called
  * text widget nearly finished
@@ -313,6 +317,10 @@
 #include "layout.h"
 #include "plugin.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define PIDFILE "/var/run/lcd4linux.pid"
 
 static char *release="LCD4Linux " VERSION " (c) 2003 Michael Reinelt <reinelt@eunet.at>";
@@ -591,6 +599,7 @@ int main (int argc, char *argv[])
       drv_quit();
     }
     pid_exit(PIDFILE);
+    cfg_exit();
     exit (0);
   }
 
@@ -641,8 +650,10 @@ int main (int argc, char *argv[])
   } else {
     drv_quit();
   }
+
   pid_exit(PIDFILE);
-  
+  cfg_exit();
+    
   if (got_signal==SIGHUP) {
     long fd;
     debug ("restarting...");

diff --git a/lcd4linux.conf.sample b/lcd4linux.conf.sample
index e4117e75a093db381c275a34181f5f5b984af0bf..197bf945250d51435b57ba049458d7fe523ae300 100644 (file)
--- a/lcd4linux.conf.sample
+++ b/lcd4linux.conf.sample
@@ -25,6 +25,14 @@ Display CF632 {
     Speed 19200
 }
 
+Display CF633 {
+    Icons 1
+    Driver 'Crystalfontz'
+    Model '633'
+    Port '/dev/tts/0'
+    Speed 19200
+}
+
 Display HD44780-20x4 {
     Driver 'HD44780'
     Port '/dev/parports/0'     
@@ -247,9 +255,10 @@ Layout L16x2 {
 }
 
 #Display 'LK204'
-Display 'HD44780-20x4'
-#Display 'CF632'
+#Display 'HD44780-20x4'
 #Display 'CF631'
+#Display 'CF632'
+Display 'CF633'
 
 #Layout  'Default'
 Layout  'L16x2'

diff --git a/mail2.c b/mail2.c
index 090bb27448c436ad3d78809d46c9a477dfdc4b94..4de52add488f249ff6807d532c7cbf33fed8ff2b 100644 (file)
--- a/mail2.c
+++ b/mail2.c
@@ -1,4 +1,4 @@
-/* $Id: mail2.c,v 1.11 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: mail2.c,v 1.12 2004/01/30 20:57:56 reinelt Exp $
  *
  * mail: pop3, imap, news functions
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: mail2.c,v $
+ * Revision 1.12  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.11  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -76,6 +80,10 @@
 #include "cfg.h"
 #include "socket.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 #define PROTO_UNKNOWN -1
 #define PROTO_POP3 110
 #define PROTO_NNTP 119

diff --git a/pixmap.c b/pixmap.c
index 9f90cedb2c430ac9040972f63eccef169a4a8ad5..d219a6d101725ef998632e6db0612f8cfcb07fe7 100644 (file)
--- a/pixmap.c
+++ b/pixmap.c
@@ -1,4 +1,4 @@
-/* $Id: pixmap.c,v 1.13 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: pixmap.c,v 1.14 2004/01/30 20:57:56 reinelt Exp $
  *
  * generic pixmap driver
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: pixmap.c,v $
+ * Revision 1.14  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.13  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -114,6 +118,10 @@
 #include "fontmap.h"
 #include "debug.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 static int ROWS=0;
 static int COLS=0;
 static int XRES=0;

diff --git a/plugin_cfg.c b/plugin_cfg.c
index 664264edba07f37a6ac276ea9c08c043bc7abcc8..14296c42a09e32e2ae21c341a16a959373cf7151 100644 (file)
--- a/plugin_cfg.c
+++ b/plugin_cfg.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_cfg.c,v 1.3 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: plugin_cfg.c,v 1.4 2004/01/30 20:57:56 reinelt Exp $
  *
  * plugin for config file access
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: plugin_cfg.c,v $
+ * Revision 1.4  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.3  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -58,6 +62,10 @@
 #include "plugin.h"
 #include "cfg.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 static void load_variables (void)
 {

diff --git a/plugin_i2c_sensors.c b/plugin_i2c_sensors.c
index a8b6747de020c0b045f228fc2f362842b4526d71..1307f676936eddb3b24a7de80dcf49d16e421635 100644 (file)
--- a/plugin_i2c_sensors.c
+++ b/plugin_i2c_sensors.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_i2c_sensors.c,v 1.6 2004/01/30 07:12:35 reinelt Exp $
+/* $Id: plugin_i2c_sensors.c,v 1.7 2004/01/30 20:57:56 reinelt Exp $
  *
  * I2C sensors plugin
  *
@@ -22,6 +22,10 @@
  *
  *
  * $Log: plugin_i2c_sensors.c,v $
+ * Revision 1.7  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.6  2004/01/30 07:12:35  reinelt
  * HD44780 busy-flag support from Martin Hejl
  * loadavg() uClibc replacement from Martin Heyl
@@ -85,6 +89,10 @@
 #include "cfg.h"
 #include "hash.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 static char *path=NULL;
 static HASH I2Csensors = { 0, };
 

diff --git a/plugin_sample.c b/plugin_sample.c
index b67cb22f1ee61022336467505a326e7b4586ba0b..30a7c84de42a2db79bdfe9e643d477fb1a0beaec 100644 (file)
--- a/plugin_sample.c
+++ b/plugin_sample.c
@@ -1,4 +1,4 @@
-/* $Id: plugin_sample.c,v 1.3 2004/01/29 04:40:02 reinelt Exp $
+/* $Id: plugin_sample.c,v 1.4 2004/01/30 20:57:56 reinelt Exp $
  *
  * plugin template
  *
@@ -23,6 +23,10 @@
  *
  *
  * $Log: plugin_sample.c,v $
+ * Revision 1.4  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.3  2004/01/29 04:40:02  reinelt
  * every .c file includes "config.h" now
  *
@@ -57,6 +61,10 @@
 #include "debug.h"
 #include "plugin.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 
 // sample function 'mul2'

diff --git a/timer.c b/timer.c
index caee98d07bf859f3f56088feb360ee412905b137..241aa4d2b0a5739f05928898976333638f8b6752 100644 (file)
--- a/timer.c
+++ b/timer.c
@@ -1,4 +1,4 @@
-/* $Id: timer.c,v 1.3 2004/01/29 04:40:03 reinelt Exp $
+/* $Id: timer.c,v 1.4 2004/01/30 20:57:56 reinelt Exp $
  *
  * generic timer handling
  *
@@ -21,6 +21,10 @@
  *
  *
  * $Log: timer.c,v $
+ * Revision 1.4  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.3  2004/01/29 04:40:03  reinelt
  * every .c file includes "config.h" now
  *
@@ -54,6 +58,10 @@
 #include "cfg.h"
 #include "timer.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 typedef struct TIMER {
   void (*callback)(void *data);

diff --git a/widget.c b/widget.c
index 7c9290a3ce6cf6d8376ef243bd3df9e918640e0f..708b289ff61abb6446d4f22c82dd1f46e5197f35 100644 (file)
--- a/widget.c
+++ b/widget.c
@@ -1,4 +1,4 @@
-/* $Id: widget.c,v 1.10 2004/01/29 04:40:03 reinelt Exp $
+/* $Id: widget.c,v 1.11 2004/01/30 20:57:56 reinelt Exp $
  *
  * generic widget handling
  *
@@ -21,6 +21,10 @@
  *
  *
  * $Log: widget.c,v $
+ * Revision 1.11  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.10  2004/01/29 04:40:03  reinelt
  * every .c file includes "config.h" now
  *
@@ -80,6 +84,10 @@
 #include "cfg.h"
 #include "widget.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 // we use a static array of widgets and not realloc()
 #define MAX_WIDGETS 256

diff --git a/widget_bar.c b/widget_bar.c
index f29623141db42cec9cf06abe574ee1bfd32827f1..5e80e5cb78fd755868ad3448ef33d1db362d0aea 100644 (file)
--- a/widget_bar.c
+++ b/widget_bar.c
@@ -1,4 +1,4 @@
-/* $Id: widget_bar.c,v 1.6 2004/01/29 04:40:03 reinelt Exp $
+/* $Id: widget_bar.c,v 1.7 2004/01/30 20:57:56 reinelt Exp $
  *
  * bar widget handling
  *
@@ -21,6 +21,10 @@
  *
  *
  * $Log: widget_bar.c,v $
+ * Revision 1.7  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.6  2004/01/29 04:40:03  reinelt
  * every .c file includes "config.h" now
  *
@@ -67,6 +71,10 @@
 #include "widget.h"
 #include "widget_bar.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 void widget_bar_update (void *Self)
 {

diff --git a/widget_icon.c b/widget_icon.c
index 0220a5dceca3ad57c0288cfd9a3127c787f9c5a4..88bbc009cc4c238fd7c63b6ccd1a41bc334bf55b 100644 (file)
--- a/widget_icon.c
+++ b/widget_icon.c
@@ -1,4 +1,4 @@
-/* $Id: widget_icon.c,v 1.3 2004/01/29 04:40:03 reinelt Exp $
+/* $Id: widget_icon.c,v 1.4 2004/01/30 20:57:56 reinelt Exp $
  *
  * icon widget handling
  *
@@ -21,6 +21,10 @@
  *
  *
  * $Log: widget_icon.c,v $
+ * Revision 1.4  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.3  2004/01/29 04:40:03  reinelt
  * every .c file includes "config.h" now
  *
@@ -55,6 +59,10 @@
 #include "widget.h"
 #include "widget_icon.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 // icons always are 8 pixels high 
 #define YRES 8
 

diff --git a/widget_text.c b/widget_text.c
index 33274ae2de8a3dd22c7bc29122f2e44e6cf97a8e..15e866c1e2563d071893a8138b4140697a402e8c 100644 (file)
--- a/widget_text.c
+++ b/widget_text.c
@@ -1,4 +1,4 @@
-/* $Id: widget_text.c,v 1.10 2004/01/29 04:40:03 reinelt Exp $
+/* $Id: widget_text.c,v 1.11 2004/01/30 20:57:56 reinelt Exp $
  *
  * simple text widget handling
  *
@@ -21,6 +21,10 @@
  *
  *
  * $Log: widget_text.c,v $
+ * Revision 1.11  2004/01/30 20:57:56  reinelt
+ * HD44780 patch from Martin Hejl
+ * dmalloc integrated
+ *
  * Revision 1.10  2004/01/29 04:40:03  reinelt
  * every .c file includes "config.h" now
  *
@@ -90,6 +94,10 @@
 #include "widget.h"
 #include "widget_text.h"
 
+#ifdef WITH_DMALLOC
+#include <dmalloc.h>
+#endif
+
 
 void widget_text_scroll (void *Self)
 {