OSSP CVS Repository

ossp - Check-in [4882]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 4882
Date: 2004-Nov-29 08:09:33 (local)
2004-Nov-29 07:09:33 (UTC)
User:rse
Branch:
Comment: Fix optional DMalloc build support.
Tickets:
Inspections:
Files:
ossp-pkg/cfg/ChangeLog      1.26 -> 1.27     3 inserted, 0 deleted
ossp-pkg/cfg/cfg_buf.c      1.13 -> 1.14     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_data.c      1.9 -> 1.10     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_main.c      1.12 -> 1.13     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_node.c      1.21 -> 1.22     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_syn.c      1.23 -> 1.24     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_syn_scan.l      1.22 -> 1.23     1 inserted, 0 deleted
ossp-pkg/cfg/cfg_test.c      1.16 -> 1.17     1 inserted, 1 deleted
ossp-pkg/cfg/cfg_util.c      1.5 -> 1.6     1 inserted, 1 deleted
ossp-pkg/cfg/configure.ac      1.11 -> 1.12     3 inserted, 0 deleted
ossp-pkg/cfg/devtool.conf      1.19 -> 1.20     2 inserted, 1 deleted
ossp-pkg/cfg/ChangeLog 1.26 -> 1.27 

--- ChangeLog    2004/11/28 17:23:45     1.26
+++ ChangeLog    2004/11/29 07:09:33     1.27
@@ -10,6 +10,9 @@
 
  Changes between 0.9.5 and 0.9.6 (27-Nov-2004 to xx-Dec-2004):
 
+   *) Fix optional DMalloc build support.
+      [Ralf S. Engelschall <rse@engelschall.com>]
+
    *) Replace fixed-size token buffer in scanner by a dynamic
       buffer (cfg_buf_t). This eliminates the old 1024 size limit
       on tokens and makes the scanner more robust.

ossp-pkg/cfg/cfg_buf.c 1.13 -> 1.14 

--- cfg_buf.c    2004/11/28 17:05:44     1.13
+++ cfg_buf.c    2004/11/29 07:09:33     1.14
@@ -33,9 +33,9 @@
 #include <string.h>
 
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_buf.h"
 #include "cfg_fmt.h"
+#include "cfg_global.h"
 
 /* opaque buffer data structure */
 struct cfg_buf_st {

ossp-pkg/cfg/cfg_data.c 1.9 -> 1.10 

--- cfg_data.c   2004/07/17 07:37:55     1.9
+++ cfg_data.c   2004/11/29 07:09:33     1.10
@@ -33,8 +33,8 @@
 #include <string.h>
 
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_data.h"
+#include "cfg_global.h"
 
 cfg_rc_t cfg_data_create(cfg_data_t **data)
 {

ossp-pkg/cfg/cfg_main.c 1.12 -> 1.13 

--- cfg_main.c   2004/11/20 12:54:07     1.12
+++ cfg_main.c   2004/11/29 07:09:33     1.13
@@ -34,12 +34,12 @@
 #include <errno.h>
 
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_fmt.h"
 #include "cfg_main.h"
 #include "cfg_data.h"
 #include "cfg_node.h"
 #include "cfg_syn.h"
+#include "cfg_global.h"
 #define _CFG_VERS_C_AS_HEADER_
 #include "cfg_vers.c"
 #undef  _CFG_VERS_C_AS_HEADER_

ossp-pkg/cfg/cfg_node.c 1.21 -> 1.22 

--- cfg_node.c   2004/11/20 14:52:56     1.21
+++ cfg_node.c   2004/11/29 07:09:33     1.22
@@ -34,10 +34,10 @@
 #include <unistd.h>
 #include <limits.h>
 
-#include "cfg_global.h"
 #include "cfg_main.h"
 #include "cfg_node.h"
 #include "cfg_fmt.h"
+#include "cfg_global.h"
 
 /* create a configuration node */
 cfg_rc_t

ossp-pkg/cfg/cfg_syn.c 1.23 -> 1.24 

--- cfg_syn.c    2004/11/28 17:23:45     1.23
+++ cfg_syn.c    2004/11/29 07:09:33     1.24
@@ -32,12 +32,12 @@
 #include <ctype.h>
 
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_grid.h"
 #include "cfg_node.h"
 #include "cfg_fmt.h"
 #include "cfg_syn.h"
 #include "cfg_buf.h"
+#include "cfg_global.h"
 
 /* prototypes for Flex-generated scanner */
 extern int  cfg_syn_lex_init(void *);

ossp-pkg/cfg/cfg_syn_scan.l 1.22 -> 1.23 

--- cfg_syn_scan.l       2004/11/28 17:28:27     1.22
+++ cfg_syn_scan.l       2004/11/29 07:09:33     1.23
@@ -75,6 +75,7 @@
 %option noyywrap
 %option nounput
 %option noyy_top_state
+%option nounistd
 
 /* scanner states */
 %x SS_DQ

ossp-pkg/cfg/cfg_test.c 1.16 -> 1.17 

--- cfg_test.c   2004/11/20 12:54:07     1.16
+++ cfg_test.c   2004/11/29 07:09:33     1.17
@@ -35,8 +35,8 @@
 
 /* OSSP cfg headers */
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_util.h"
+#include "cfg_global.h"
 
 /* main test program procedure */
 int main(int argc, char *argv[])

ossp-pkg/cfg/cfg_util.c 1.5 -> 1.6 

--- cfg_util.c   2004/11/20 12:54:07     1.5
+++ cfg_util.c   2004/11/29 07:09:33     1.6
@@ -34,8 +34,8 @@
 #include <unistd.h>
 
 #include "cfg.h"
-#include "cfg_global.h"
 #include "cfg_util.h"
+#include "cfg_global.h"
 
 cfg_rc_t cfg_util_readfile(const char *filename, char **buf_ptr, size_t *buf_size, size_t *buf_used)
 {

ossp-pkg/cfg/configure.ac 1.11 -> 1.12 

--- configure.ac 2004/10/31 19:35:31     1.11
+++ configure.ac 2004/11/29 07:09:33     1.12
@@ -52,6 +52,9 @@
 
 AC_CHECK_EXTLIB(Dmalloc, dmalloc, dmalloc_debug, dmalloc.h,
                 AC_DEFINE(WITH_DMALLOC, 1, [define if building with Dmalloc]))
+if test ".$with_dmalloc" = .yes; then
+    CFLAGS=`echo "X$CFLAGS" | sed -e 's;^X;;' -e 's; -Wredundant-decls;;'`
+fi
 
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES([Makefile cfg-config])

ossp-pkg/cfg/devtool.conf 1.19 -> 1.20 

--- devtool.conf 2004/11/27 19:56:24     1.19
+++ devtool.conf 2004/11/29 07:09:33     1.20
@@ -44,7 +44,8 @@
         --disable-shared \
         --enable-maintainer \
         --enable-debug \
-        --with-perl
+        --with-perl \
+        --with-dmalloc=/usr/opkg \
         "$@"
 
 %release

CVSTrac 2.0.1