Fix release suffix problem.

LibShMem 2.0.0 and LibDataStr 2.0.0 now supported !
Update to 2.1.0-1 release,
2005-01-24 01:34:01 +00:00 · 2005-01-24 01:19:50 +00:00 · 2005-01-24 01:19:39 +00:00 · 2005-01-24 00:50:55 +00:00 · 2005-01-20 00:26:48 +00:00 · 2005-01-20 00:07:27 +00:00
31 changed files with 3724 additions and 1776 deletions
--- a/25
+++ b/25
@@ -0,0 +1,25 @@
+# $RCSfile: Makefile,v $
+# $Revision: 1.3 $
+# $Name:  $
+# $Date: 2003/07/16 23:32:06 $
+# $Author: agibert $
+
+#------------------------------------------------------------------------------
+# Main Makefile
+#------------------------------------------------------------------------------
+
+
+
+SUBDIRS := include lib util demo doc
+
+FILE_DOC := *.txt
+
+
+
+include Makefile.var
+include Makefile.rule
+
+
+
+dir_clean:
+	$(RM) $(PROG_VERSION_NAME).src.*
--- a/Makefile.rule
+++ b/Makefile.rule
@@ -0,0 +1,359 @@
+# $RCSfile: Makefile.rule,v $
+# $Revision: 1.4 $
+# $Name:  $
+# $Date: 2003/07/16 23:37:37 $
+# $Author: agibert $
+
+#------------------------------------------------------------------------------
+# Rule Makefile
+#------------------------------------------------------------------------------
+
+
+
+# -----------------   DEFAULT RULES  ---------------------
+default:all
+
+
+
+# -----------------   IMPLICITES RULES  --------------------- 
+
+# Here are all the rules allowing to compile sources files
+# c -> o
+%.o:%.c
+	$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
+
+# c -> executable
+.c :
+	$(CC) $(CFLAGS) $(INCLUDE) $< -o $@ -I . $(LIB)
+
+# o -> executable 
+%:%.o
+	$(CC) $(LFLAGS) -o $@ $? $(LIB)
+
+# .o -> .so
+%.so:%.o
+	$(CC) $(LDSOFLAGS) -shared -o $@ $? $(LIB)
+
+%.a:%.o
+	$(AR) -r $@ $?
+
+$(OBJECTS) : $(SRC)
+
+
+
+# "depend" rule allow to build the dependancy file
+depend:
+
+
+
+# "all" Rule
+all: dir_all
+ifneq ($(SUBDIRS),)
+	for d in $(SUBDIRS) ; do $(MAKE) all -C $$d/ ; done
+endif
+
+dir_all: $(TARGETS)
+
+
+
+# "clean" Rule
+clean: dir_clean
+ifneq ($(SUBDIRS),)
+	for d in $(SUBDIRS) ; do $(MAKE) clean -C $$d/ ; done
+endif
+
+dir_clean:
+	@(command="$(RM) $(TARGETS) $$(echo $(SRC) | sed "s/\.c/\.o/g") ;" ; \
+	echo $$command ; \
+	eval $$command ;)
+
+
+
+# "pre_install" Rule
+# This empty rule can be overiden in module Makefile in order to run pre-install commands.
+pre_install:
+
+
+
+# "post_install" Rule
+# This empty rule can be overiden in module Makefile in order to run post-install commands.
+post_install:
+
+
+
+# "install" Rule
+install: dir_install
+ifneq ($(SUBDIRS),)
+	for d in $(SUBDIRS) ; do $(MAKE) install -C $$d/ ; done
+endif
+
+dir_install: dir_all
+	$(MAKE) pre_install
+ifneq ($(FILE_BIN),)
+	@if test ! -d $(PATH_BIN) ; then $(MKDIR) $(PATH_BIN) ; fi
+	$(INSTALLBIN) $(FILE_BIN) $(PATH_BIN)
+endif
+ifneq ($(FILE_BINSUID),)
+	@if test ! -d $(PATH_BINSUID) ; then $(MKDIR) $(PATH_BINSUID) ; fi
+	$(INSTALLBINSUID) $(FILE_BINSUID) $(PATH_BINSUID)
+endif
+ifneq ($(FILE_CGI),)
+	@if test ! -d $(PATH_CGI) ; then $(MKDIR) $(PATH_CGI) ; fi
+	$(INSTALLCGI) $(FILE_CGI) $(PATH_CGI)
+endif
+ifneq ($(FILE_DOC),)
+	@if test ! -d $(PATH_DOC) ; then $(MKDIR) $(PATH_DOC) ; fi
+	$(INSTALLDOC) $(FILE_DOC) $(PATH_DOC)
+endif
+ifneq ($(FILE_ETC),)
+	@if test ! -d $(PATH_ETC) ; then $(MKDIR) $(PATH_ETC) ; fi
+	$(INSTALLETC) $(FILE_ETC) $(PATH_ETC)
+endif
+ifneq ($(FILE_HOME),)
+	@if test ! -d $(PATH_HOME) ; then $(MKDIR) $(PATH_HOME) ; fi
+	$(INSTALLHOME) $(FILE_HOME) $(PATH_HOME)
+endif
+ifneq ($(FILE_HOMEBIN),)
+	@if test ! -d $(PATH_HOMEBIN) ; then $(MKDIR) $(PATH_HOMEBIN) ; fi
+	$(INSTALLHOMEBIN) $(FILE_HOMEBIN) $(PATH_HOMEBIN)
+endif
+ifneq ($(FILE_LIB),)
+	@if test ! -d $(PATH_LIB) ; then $(MKDIR) $(PATH_LIB) ; fi
+	$(INSTALLLIB) $(FILE_LIB) $(PATH_LIB)
+endif
+ifneq ($(FILE_HOMELIB),)
+	@if test ! -d $(PATH_HOMELIB) ; then $(MKDIR) $(PATH_HOMELIB) ; fi
+	$(INSTALLHOMELIB) $(FILE_HOMELIB) $(PATH_HOMELIB)
+endif
+ifneq ($(FILE_INCLUDE),)
+	@if test ! -d $(PATH_INCLUDE) ; then $(MKDIR) $(PATH_INCLUDE) ; fi
+	$(INSTALLINCLUDE) $(FILE_INCLUDE) $(PATH_INCLUDE)
+endif
+ifneq ($(FILE_MAN),)
+	@for d in $(FILE_MAN) ; do \
+		if test ! -d $(PATH_MAN)/$(FILE_MAN) ; then \
+			$(MKDIR) $(PATH_MAN)/$(FILE_MAN) ; \
+		fi ; \
+		$(INSTALLMAN) $(FILE_MAN)/* $(PATH_MAN)/$(FILE_MAN) ; \
+	done
+endif
+ifneq ($(FILE_WEBCONF),)
+	@if test ! -d $(PATH_WEBCONF) ; then $(MKDIR) $(PATH_WEBCONF) ; fi
+	$(INSTALLWEBCONF) $(FILE_WEBCONF) $(PATH_WEBCONF)
+endif
+ifneq ($(FILE_WEBCONFSSL),)
+	@if test ! -d $(PATH_WEBCONFSSL) ; then $(MKDIR) $(PATH_WEBCONFSSL) ; fi
+	$(INSTALLWEBCONFSSL) $(FILE_WEBCONFSSL) $(PATH_WEBCONFSSL)
+endif
+ifneq ($(FILE_HTML),)
+	@if test ! -d $(PATH_HTML) ; then $(MKDIR) $(PATH_HTML) ; fi
+	$(INSTALLHTML) $(FILE_HTML) $(PATH_HTML)
+endif
+ifneq ($(FILE_WEBICONS),)
+	@if test ! -d $(PATH_WEBICONS) ; then $(MKDIR) $(PATH_WEBICONS) ; fi
+	$(INSTALLWEBICONS) $(FILE_WEBICONS) $(PATH_WEBICONS)
+endif
+	$(MAKE) post_install
+
+
+
+# "pre_uninstall" Rule
+# This empty rule can be overiden in module Makefile in order to run pre-uninstall commands.
+
+pre_uninstall:
+
+
+
+# "post_uninstall" Rule
+# This empty rule can be overiden in module Makefile in order to run post-uninstall commands.
+post_uninstall:
+
+
+
+# "uninstall" Rule
+uninstall: dir_uninstall
+ifneq ($(SUBDIRS),)
+	for d in $(SUBDIRS) ; do $(MAKE) uninstall -C $$d/ ; done
+endif
+
+dir_uninstall:
+	$(MAKE) pre_uninstall
+ifneq ($(FILE_BIN),)
+	@(if test -d $(PATH_BIN) ; then \
+		$(CD) $(PATH_BIN) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_BIN)" ; \
+			echo "$(RM) $(FILE_BIN)" ; \
+                fi ; \
+		$(RM) $(FILE_BIN) ; \
+	fi)
+endif
+ifneq ($(FILE_BINSUID),)
+	@(if test -d $(PATH_BINSUID) ; then \
+		$(CD) $(PATH_BINSUID) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+		if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_BINSUID)" ; \
+			echo "$(RM) $(FILE_BINSUID)" ; \
+		fi ; \
+		$(RM) $(FILE_BINSUID) ; \
+	fi)
+endif
+ifneq ($(FILE_CGI),)
+	@(if test -d $(PATH_CGI) ; then \
+		$(CD) $(PATH_CGI) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_CGI)" ; \
+			echo "$(RM) $(FILE_CGI)" ; \
+                fi ; \
+		$(RM) $(FILE_CGI) ; \
+	fi)
+endif
+ifneq ($(FILE_DOC),)
+	@(if test -d $(PATH_DOC) ; then \
+		$(CD) $(PATH_DOC) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_DOC)" ; \
+			echo "$(RM) $(FILE_DOC)" ; \
+                fi ; \
+		$(RM) $(FILE_DOC) ; \
+	fi)
+endif
+ifneq ($(FILE_ETC),)
+	@(if test -d $(PATH_ETC) ; then \
+		$(CD) $(PATH_ETC) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_ETC)" ; \
+			echo "$(RM) $(FILE_ETC)" ; \
+                fi ; \
+		$(RM) $(FILE_ETC) ; \
+	fi)
+endif
+ifneq ($(FILE_HOME),)
+	@(if test -d $(PATH_HOME) ; then \
+		$(CD) $(PATH_HOME) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_HOME)" ; \
+			echo "$(RM) $(FILE_HOME)" ; \
+                fi ; \
+		$(RM) $(FILE_HOME) ; \
+	fi)
+endif
+ifneq ($(FILE_HOMEBIN),)
+	@(if test -d $(PATH_HOMEBIN) ; then \
+		$(CD) $(PATH_HOMEBIN) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_HOMEBIN)" ; \
+			echo "$(RM) $(FILE_HOMEBIN)" ; \
+                fi ; \
+		$(RM) $(FILE_HOMEBIN) ; \
+	fi)
+endif
+ifneq ($(FILE_LIB),)
+	@(if test -d $(PATH_LIB) ; then \
+		$(CD) $(PATH_LIB) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_LIB)" ; \
+			echo "$(RM) $(FILE_LIB)" ; \
+                fi ; \
+		$(RM) $(FILE_LIB) ; \
+	fi)
+endif
+ifneq ($(FILE_HOMELIB),)
+	@(if test -d $(PATH_HOMELIB) ; then \
+		$(CD) $(PATH_HOMELIB) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_HOMELIB)" ; \
+			echo "$(RM) $(FILE_HOMELIB)" ; \
+                fi ; \
+		$(RM) $(FILE_HOMELIB) ; \
+	fi)
+endif
+ifneq ($(FILE_INCLUDE),)
+	@(if test -d $(PATH_INCLUDE) ; then \
+		$(CD) $(PATH_INCLUDE) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_INCLUDE)" ; \
+			echo "$(RM) $(FILE_INCLUDE)" ; \
+                fi ; \
+		$(RM) $(FILE_INCLUDE) ; \
+	fi)
+endif
+ifneq ($(FILE_MAN),)
+	@(if test -d $(PATH_MAN) ; then \
+		$(CD) $(PATH_MAN) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_MAN)" ; \
+			echo "$(RM) $(FILE_MAN)" ; \
+                fi ; \
+		$(RM) $(FILE_MAN) ; \
+	fi)
+endif
+ifneq ($(FILE_WEBCONF),)
+	@(if test -d $(PATH_WEBCONF) ; then \
+		$(CD) $(PATH_WEBCONF) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_WEBCONF)" ; \
+			echo "$(RM) $(FILE_WEBCONF)" ; \
+                fi ; \
+		$(RM) $(FILE_WEBCONF) ; \
+	fi)
+endif
+ifneq ($(FILE_WEBCONFSSL),)
+	@(if test -d $(PATH_WEBCONFSSL) ; then \
+		$(CD) $(PATH_WEBCONFSSL) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_WEBCONFSSL)" ; \
+			echo "$(RM) $(FILE_WEBCONFSSL)" ; \
+                fi ; \
+		$(RM) $(FILE_WEBCONFSSL) ; \
+	fi)
+endif
+ifneq ($(FILE_HTML),)
+	@(if test -d $(PATH_HTML) ; then \
+		$(CD) $(PATH_HTML) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_HTML)" ; \
+			echo "$(RM) $(FILE_HTML)" ; \
+                fi ; \
+		$(RM) $(FILE_HTML) ; \
+	fi)
+endif
+ifneq ($(FILE_WEBICONS),)
+	@(if test -d $(PATH_WEBICONS) ; then \
+		$(CD) $(PATH_WEBICONS) ; \
+		(echo $(MAKEFLAGS) | grep s) > /dev/null ; \
+                if [ $$? -ne 0 ] ; then \
+			echo "$(CD) $(PATH_WEBICONS)" ; \
+			echo "$(RM) $(FILE_WEBICONS)" ; \
+                fi ; \
+		$(RM) $(FILE_WEBICONS) ; \
+	fi)
+endif
+	$(MAKE) post_uninstall
+
+
+
+# "distrib" Rule
+distrib:
+	$(MAKE) clean 
+	$(MKDIR) $(TMP_DIR)/$(PROG_VERSION_NAME)
+	$(TAR) cf - . | $(TAR) xvpf - -C $(TMP_DIR)/$(PROG_VERSION_NAME)
+	$(TAR) cvf - -C $(TMP_DIR) --exclude CVS $(PROG_VERSION_NAME) | $(GZIP)  -9 >$(PROG_VERSION_NAME).src.tgz
+	$(TAR) cvf - -C $(TMP_DIR) --exclude CVS $(PROG_VERSION_NAME) | $(BZIP2) -9 >$(PROG_VERSION_NAME).src.tbz2
+	$(MV) $(TMP_DIR)/$(PROG_VERSION_NAME) .
+	$(ZIP) -r -m -9 $(PROG_VERSION_NAME).src.zip $(PROG_VERSION_NAME) -x \*/CVS/\*
+	$(RM) -r $(PROG_VERSION_NAME)
--- a/Makefile.var
+++ b/Makefile.var
@@ -0,0 +1,92 @@
+# $RCSfile: Makefile.var,v $
+# $Revision: 1.4 $
+# $Name:  $
+# $Date: 2005/01/19 23:30:05 $
+# $Author: agibert $
+
+#------------------------------------------------------------------------------
+# Variable Makefile
+#------------------------------------------------------------------------------
+
+
+
+PROG_NAME=libnode
+PROG_TAG=$Name:  $
+
+ifeq ($(words $(PROG_TAG)),2)
+	PROG_VERSION_NAME=$(subst _,.,$(word 2, $(PROG_TAG)))
+else
+	PROG_VERSION_NAME=$(PROG_NAME)
+endif
+
+CC=/usr/bin/gcc
+AR=/usr/bin/ar
+
+CD=cd
+MKDIR=/bin/mkdir -p
+RM=/bin/rm -f
+MV=/bin/mv
+TAR=tar
+GZIP=gzip
+BZIP2=bzip2
+ZIP=zip
+
+PATH_WEB=$(addprefix /var/httpd/, $(PROG_NAME))
+
+INSTALLBIN=/usr/bin/install -m 755
+INSTALLBINSUID=/usr/bin/install -m 4755
+INSTALLCGI=/usr/bin/install -m 555
+INSTALLDOC=/usr/bin/install -m 444
+INSTALLETC=/usr/bin/install -m 600
+INSTALLHOME=/usr/bin/install -m 400
+INSTALLHOMEBIN=/usr/bin/install -m 750
+INSTALLLIB=/usr/bin/install -m 755
+INSTALLHOMELIB=/usr/bin/install -m 755
+INSTALLINCLUDE=/usr/bin/install -m 644
+INSTALLMAN=/usr/bin/install -m 644
+INSTALLWEBCONF=/usr/bin/install -m 644
+INSTALLWEBCONFSSL=/usr/bin/install -m 644
+INSTALLHTML=/usr/bin/install -m 444
+INSTALLWEBICONS=/usr/bin/install -m 444
+
+ifeq ($(ROOT),)
+	HOME_DIR := /
+else
+	HOME_DIR := $(ROOT)
+endif
+
+PATH_BIN := $(addprefix $(HOME_DIR),/usr/bin)
+PATH_BINSUID := $(PATH_BIN)
+PATH_CGI := $(addprefix $(HOME_DIR),$(addprefix $(PATH_WEB),/cgi-bin))
+PATH_DOC := $(addprefix $(HOME_DIR),$(addprefix /usr/share/doc/,$(PROG_VERSION_NAME)))
+PATH_ETC := $(addprefix $(HOME_DIR),$(addprefix /etc/,$(MODULE)))
+PATH_HOME := $(addprefix $(HOME_DIR),$(addprefix $(addprefix /var/lib/, $(PROG_NAME)), $(MODULE)))
+PATH_HOMEBIN := $(addprefix $(HOME_DIR), $(addprefix $(addprefix /var/lib/, $(PROG_NAME)), /bin))
+PATH_LIB := $(addprefix $(HOME_DIR),/usr/lib)
+PATH_HOMELIB := $(addprefix $(HOME_DIR), $(addprefix $(addprefix /var/lib/, $(PROG_NAME)), /lib))
+PATH_INCLUDE := $(addprefix $(HOME_DIR),/usr/include)
+PATH_MAN := $(addprefix $(HOME_DIR),/usr/share/man)
+PATH_WEBCONF := $(addprefix $(HOME_DIR),/etc/httpd/conf/vhosts)
+PATH_WEBCONFSSL := $(addprefix $(HOME_DIR),/etc/httpd/conf/ssl)
+PATH_HTML := $(addprefix $(HOME_DIR),$(addprefix $(addprefix $(PATH_WEB),/html/),$(MODULE)))
+PATH_WEBICONS := $(addprefix $(HOME_DIR),$(addprefix $(PATH_WEB),/icons))
+
+PATH_LOG := $(addprefix $(HOME_DIR),/var/log)
+
+TMP_DIR=/tmp
+
+CFLAGS=
+
+ifeq ($(DEBUG), YES)
+        CFLAGS += -g -D_DEBUG
+endif
+ifeq ($(DEBUG), Y)
+        CFLAGS += -g -D_DEBUG
+endif
+
+ifeq ($(OPTIM), YES)
+        CFLAGS += -O3
+endif
+ifeq ($(OPTIM), Y)
+        CFLAGS += -O3
+endif
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,35 +1,36 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 2.3 $
+# $Revision: 2.8 $
 # $Name:  $
-# $Date: 2002/03/01 09:43:21 $
+# $Date: 2005/01/24 01:19:50 $
 # $Author: agibert $





-Welcome to LibNode 2.0.x !
+Welcome to LibNode 2.1.x !



-This release of LibNode support the following OS:
-	- Linux 2.2.X and 2.4.x (tested on RedHat & Mandrake),
+This release of LibNode supports the following OS:
+	- Linux 2.2.x, 2.4.x and 2.6.x (tested on RedHat & Mandrake),
 	- Solaris 2.6,
-	- Windows NT4 & 2000.
+	- Windows NT4, 2000 and XP.



-The support of LibVer is now optional.
-LibShm and LibDataStr are no more supported.
+The support of LibVer is now optional (To enable it, use: make _LIBVER_SUPPORT=1 all).
+
+LibNode support LibShMem 2.0.0 and LibDataStr 2.0.0 !



-Warning: Associated documentation is outdated...
+Warning: Associated documentation (including the comments !) is outdated...
 Please read demo and ndbench code.



-Libnode is licensed under the GPL/LGPL GNU License.
+Libnode is licensed under the LGPL/GPL GNU Licenses.
 For more information, please read the corresponding source file headers.
 The license details can be found in the GNU-GPL.txt, GNU-LGPL.txt and GNU-FDL.txt files.

@@ -38,3 +39,6 @@ The license details can be found in the GNU-GPL.txt, GNU-LGPL.txt and GNU-FDL.tx
 Enjoy it!

 Your LibNode Team.
+
+arnaud@rx3.net
+http://www.rx3.org/dvp/libnode
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,16 +1,77 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 2.9 $
+# $Revision: 2.20 $
 # $Name:  $
-# $Date: 2002/04/09 17:41:44 $
+# $Date: 2005/01/24 00:50:55 $
 # $Author: agibert $





--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.1.0-1 - A. Gibert - 24/01/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+All:		This new LibNode branch (2.1.x) should support the forthcoming new LibShMem branch (2.0.x),
+LibNode:	Add symbol lookup support for manager, allocator and desallocator functions call,
+		New Allocator and desallocator API interace,
+		Code cleanup,
+NDBench:	DS_Open now support an arg in order to use or not symbol lookup,
+		Add test-*-s.ndb batch files witch use symbol lookup.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.7-1 - A. Gibert - 20/01/05
+------------------------------------------------------------------------------------------------------------------------------------
+
+All:		Add to Makefile.var auto version label detection from CVS Tag.
+		This should be the final release of the 2.0 branch,
+		This new release is developped for the MICOT/Target project (Banque de France - Paris).
+LibNode:	Minor bug fixes in ND_*_Info_Print() functions and ND_Library_StdErr_Set alias defines.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.6-1 - A. Gibert - 24/08/04
+------------------------------------------------------------------------------------------------------------------------------------
+
+All:		Generate *-c executables with checking mode enabled (ND_MODE=1),
+		Code clean up and more cleanly indented,
+		This new release is developped for the MICOT/Target project (Banque de France - Paris),
+LibNode:	Add OpenStruct tracing support (Enabled by ND_MODE=1 and Debug=1),
+		Re-implement for Unix and Windows target, full address checking in ND_Address_Check(),
+NDDemo0:	Add LibNode 2.0.6 support: Add ND_Library_Open/Close() calls,
+NDBench:	Add Lib_Open, Lib_Close, Index_Value_Break and Index_Node_Break command,
+		Improve random number generation,
+		Add test-10.ndb and test-errror.ndb batch files.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.5-1 - A. Gibert / M. Regimbeau - 28/07/03
+------------------------------------------------------------------------------------------------------------------------------------
+
+All:		Add a new Makefile system (Makefile.rule and Makefile.var),
+		Add 'make distrib' support,
+		Add libnode.spec file,
+		Move node.h from lib directory to include directory.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.4-1 - A. Gibert - 29/07/02
+------------------------------------------------------------------------------------------------------------------------------------
+
+All:		This release of libnode pass with sucess valgrind test on linux.
+LibNode:	Add and use ND_Index_Clear() private API,
+NbBench:	Add fclose() call at the end of batch_run.
+
+
+
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.3-1 - A. Gibert - 09/04/02
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 All:		Fix Microsoft Visual Project to generate Debug and Release config correctly,
 LibNode:	Change index type numeric print value from decimal to hexa in ND_Index_Info_Print() API,
@@ -22,9 +83,9 @@ NbBench:	Generate in Debug mode ndbenchd.exe and in Release mode ndbenchd.exe.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.2-2 - A. Gibert - 01/03/02
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 All:		Add GNU-GPL.txt, GNU-LGPL.txt and GNU-FDL.txt license files,
 All:		Add license stuff in ReandMe.
@@ -35,9 +96,9 @@ NbBench:	Add GPL header in ndbench.c.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.2-1 - A. Gibert - 27/02/02
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 All:		Makefiles now generate static and dynamic objects,
 All:		Add no libver support in Makefiles,
@@ -49,26 +110,26 @@ NbBench:	Implement Index_Close and Index_Info_Print functions.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.1-1 - A. Gibert - 28/11/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 LibNode:	Fix the error level of TIMAS_KO: it's now an error status.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.0-1 - A. Gibert - 26/11/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 All:		Merge the main CVS trunc with the win32 branche (2.0.0-alpha5),
 		Switch file release to 2.0.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.0-alpha5 - A. Gibert - 25/10/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 LibNode:	Add Open/Close Index support,
 LibNode:	Fix return code next to empty struct manipulations,
@@ -76,9 +137,9 @@ NdBench:	Add full multi index support.



--------------------------------------------------------------------------------
-LibNode V 2.0.0-alpha4 - A. Gibert - 28/9/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.0-alpha4 - A. Gibert - 28/09/01
+------------------------------------------------------------------------------------------------------------------------------------

 All:		Add optional libver support,
 LibNode:	Fix missing recursive offset args,
@@ -87,18 +148,18 @@ NdBench:	Fix local stack pointer big bug.



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 LibNode V 2.0.0-alpha3 - A. Gibert - 18/9/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------

 New manager args interface (again !),
 ndbench support batch mode.



--------------------------------------------------------------------------------
-LibNode V 2.0.0-alpha2 - A. Gibert - 8/9/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.0-alpha2 - A. Gibert - 08/09/01
+------------------------------------------------------------------------------------------------------------------------------------

 Re-enable libver support for unix,
 Bug fixes,
@@ -106,53 +167,54 @@ Code cleanup.



--------------------------------------------------------------------------------
-LibNode V 2.0.0-alpha1 - A. Gibert - 7/9/01
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 2.0.0-alpha1 - A. Gibert - 07/09/01
+------------------------------------------------------------------------------------------------------------------------------------

 Add Full win32 support,
 Remove libver support,
 Multi index support,
 New manager args format,
 Major Code cleanup et standardisation.
+This new version (2.0.x) is developped for the TIMA project (Misys IBS - France).



--------------------------------------------------------------------------------
-LibNode V 1.0.0 - S. Mas / A. Gibert - 18/7/00
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 1.0.0 - S. Mas / A. Gibert - 18/07/00
+------------------------------------------------------------------------------------------------------------------------------------

 Unix (Linux and Solaris) version only, for BDM project (Société Générale - Paris)
 Major code rewrite.



--------------------------------------------------------------------------------
-LibNode V 0.2.2 - A. Gibert - 1/6/93
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 0.2.2 - A. Gibert - 01/06/93
+------------------------------------------------------------------------------------------------------------------------------------

 Embeded version on OS/2 2.1 (Companie Générale des Eaux - Paris)



--------------------------------------------------------------------------------
-LibNode V 0.2.1 - A. Gibert - 1/4/92
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 0.2.1 - A. Gibert - 01/04/92
+------------------------------------------------------------------------------------------------------------------------------------

 Amiga and PC support (Bareau de Draguignan - Ste Maxime).



--------------------------------------------------------------------------------
-LibNode V 0.2.0 - A. Gibert - 1/3/91
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 0.2.0 - A. Gibert - 01/03/91
+------------------------------------------------------------------------------------------------------------------------------------

 C version aided by p2c tools on Pyramid (Swansee University - Wales).



--------------------------------------------------------------------------------
-LibNode V 0.1.0 - A. Gibert - 1/12/90
--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+LibNode V 0.1.0 - A. Gibert - 01/12/90
+------------------------------------------------------------------------------------------------------------------------------------

 Inital version in Pascal on Pyramid (Swansee University - Wales).
--- a/ToDo.txt
+++ b/ToDo.txt
@@ -1,14 +1,14 @@
 # $RCSfile: ToDo.txt,v $
-# $Revision: 2.1 $
+# $Revision: 2.5 $
 # $Name:  $
-# $Date: 2001/11/26 11:25:11 $
+# $Date: 2005/01/24 01:19:50 $
 # $Author: agibert $





- More debug !
+- Check LibShMem/LibDataStr support (via symbol lookup support),
+- Add Cache Value option,
 - New English documentation (man/tex),
- Improve API consitency,
- Re-enable LibShm/LibDataStr support (via TIMAT_DataStruct implementation).
+- Improve API consitency.
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -1,10 +1,54 @@
-all: demo0 demo0-static
+SRC      := nddemo0.c
+TARGETS  := nddemo0 nddemo0-c nddemo0-static nddemo0-static-c
+FILE_BIN := nddemo0 nddemo0-c nddemo0-static nddemo0-static-c
+FILE_LIB := nddemo0.dat

-demo0-static: demo0.c ../lib/node.h ../lib/libnode.a Makefile
-	gcc -g -o demo0-static -I ../lib -ldl demo0.c ../lib/libnode.a

-demo0: demo0.c ../lib/node.h ../lib/libnode.so Makefile
-	gcc -g -o demo0 -I ../lib -L ../lib -ldl -lnode demo0.c

-clean:
-	rm -f demo0 demo0-static
+include ../Makefile.var
+include ../Makefile.rule
+
+
+
+DEP_STATIC  += ../lib/libnode.a
+DEP_DYNAMIC += ../lib/libnode.so
+INCLUDE     += -I . -I ../include
+LIBDIR      += -L . -L ../lib
+LIB_STATIC  += ../lib/libnode.a -ldl
+LIB_DYNAMIC += -lnode -ldl
+CFLAGS      += -rdynamic
+
+ifdef _LIBVER_SUPPORT
+	DEP_STATIC  += ../../libver/ver.h ../../libver/libver.a
+	DEP_DYNAMIC += ../../libver/ver.h ../../libver/libver.so
+	INCLUDE     += -I ../../libver/lib
+	LIBDIR      += -L ../../libver/lib
+
+        ifeq ($(OSTYPE),linux-gnu)
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
+        else
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
+        endif
+
+        CFLAGS              += -D_LIBVER_SUPPORT
+endif
+
+ND_CHECK_FLAGS   = -DND_MODE=0
+ND_NOCHECK_FLAGS = -DND_MODE=1
+
+
+
+nddemo0: nddemo0.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+nddemo0-c: nddemo0.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+nddemo0-static: nddemo0.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_NOCHECK_FLAGS) $(INCLUDE) $< $(LIB_STATIC)
+
+nddemo0-static-c: nddemo0.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS) $(ND_CHECK_FLAGS)   $(INCLUDE) $< $(LIB_STATIC)
+
--- a/demo/nddemo0.c
+++ b/demo/nddemo0.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: nddemo0.c,v $                                                         */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.1 $                                                           */
+/* $Revision: 2.8 $                                                                */
 /* $Name:  $                                                                       */
-/* $Date: 2002/02/28 22:00:35 $                                                    */
+/* $Date: 2004/08/23 22:48:37 $                                                    */
 /* $Author: agibert $                                                              */
 /*---------------------------------------------------------------------------------*/

@@ -21,7 +21,7 @@
 /*    GNU Lesser General Public License for more details.                          */
 /*                                                                                 */
 /*    You should have received a copy of the GNU General Public License            */
-/*    along with Foobar; if not, write to the Free Software                        */
+/*    along with LibNode; if not, write to the Free Software                       */
 /*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    */
 /*---------------------------------------------------------------------------------*/

@@ -31,31 +31,31 @@

 #include <stdio.h>
 #include <errno.h>
+
 #include <node.h>
-//#include <windows.h> 
 


-#define DEMO_FILE_NAME          "demo0.txt"
-#define STRING_LEN              (short)1024
-#define STRING_SIZE             (short)(STRING_LEN + 1)
-#define VAL_LEN                 (short)64
-#define VAL_SIZE                (short)(VAL_LEN + 1)
-#define INDEX_NB                (short)4
+#define DEMO_FILE_NAME          "nddemo0.dat"
+#define STRING_LEN              ( short) 1024
+#define STRING_SIZE             ( short) ( STRING_LEN + 1)
+#define VAL_LEN                 ( short) 64
+#define VAL_SIZE                ( short) ( VAL_LEN + 1)
+#define INDEX_NB                ( short) 4

-#define NDT_CMD_INDEX0_PRINT    (NDT_Command)64
-#define NDT_CMD_INDEX1_PRINT    (NDT_Command)65
-#define NDT_CMD_INDEX2_PRINT    (NDT_Command)66
-#define NDT_CMD_INDEX3_PRINT    (NDT_Command)67
+#define NDD_CMD_INDEX0_PRINT    ( NDT_Command) 64
+#define NDD_CMD_INDEX1_PRINT    ( NDT_Command) 65
+#define NDD_CMD_INDEX2_PRINT    ( NDT_Command) 66
+#define NDD_CMD_INDEX3_PRINT    ( NDT_Command) 67



 typedef struct Demo_Value
 {
-    char  Val0[VAL_SIZE];
-    char  Val1[VAL_SIZE];
-    char  Val2[VAL_SIZE];
-    char  Val3[VAL_SIZE];
+	char  Val0[ VAL_SIZE];
+	char  Val1[ VAL_SIZE];
+	char  Val2[ VAL_SIZE];
+	char  Val3[ VAL_SIZE];
 } Demo_Value;


@@ -64,7 +64,7 @@ typedef struct Demo_Value
 /*    Prototypes                                                                   */
 /*---------------------------------------------------------------------------------*/

-NDT_Status  Manager_Demo_DS( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_Command, va_list);
+NDT_Status  Demo_DS_Manager( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_Command, va_list);
 void        DataStruct_Load( NDT_Root  *,  FILE  *);
 void        DataStruct_Load( NDT_Root  *,  FILE  *);
 void        Demo( char  *, short);
@@ -80,7 +80,7 @@ int         main( int, char  **);
 /*                                                                                 */
 /*---------------------------------------------------------------------------------*/

-NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_Node  *Node_Ptr, NDT_Command  Command, va_list  Args)
+NDT_Status  Demo_DS_Manager( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_Node  *Node_Ptr, NDT_Command  Command, va_list  Args)
 {
    NDT_Command_Name  Command_Name;

@@ -94,7 +94,7 @@ NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_No

            Command_Name = "NDD_CMD_MANAGER_VERSION";

-            *Version_Name_Ptr = "$Revision: 2.1 $   $Name:  $   $Date: 2002/02/28 22:00:35 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.8 $   $Name:  $   $Date: 2004/08/23 22:48:37 $   $Author: agibert $";

            return( NDS_OK);
        }
@@ -117,28 +117,28 @@ NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_No

            switch(Cmd)
            {
-                case NDT_CMD_INDEX0_PRINT:
+                case NDD_CMD_INDEX0_PRINT:
                {
                    *Reply_Index_Id_Ptr = 0;
                    *Reply_Command_Ptr = NDD_CMD_VALUE_PRINT;
                    break;
                }

-                case NDT_CMD_INDEX1_PRINT:
+                case NDD_CMD_INDEX1_PRINT:
                {
                    *Reply_Index_Id_Ptr = 1;
                    *Reply_Command_Ptr = NDD_CMD_VALUE_PRINT;
                    break;
                }

-                case NDT_CMD_INDEX2_PRINT:
+                case NDD_CMD_INDEX2_PRINT:
                {
                    *Reply_Index_Id_Ptr = 2;
                    *Reply_Command_Ptr = NDD_CMD_VALUE_PRINT;
                    break;
                }

-                case NDT_CMD_INDEX3_PRINT:
+                case NDD_CMD_INDEX3_PRINT:
                {
                    *Reply_Index_Id_Ptr = 3;
                    *Reply_Command_Ptr = NDD_CMD_VALUE_PRINT;
@@ -228,63 +228,63 @@ NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_No

                    if( rc < 0)
                    {
-                        return(NDS_LOWER);
+                        return( NDS_LOWER);
                    }
                    else
                    {
                        if( rc > 0)
                        {
-                            return(NDS_GREATER);
+                            return( NDS_GREATER);
                        }
                        else
                        {
-                            return(NDS_EQUAL);
+                            return( NDS_EQUAL);
                        }
                    }
                }

                case 1:
                {
-                    int  val1 = atoi(Value1_Ptr->Val1);
-                    int  val2 = atoi(Value2_Ptr->Val1);
+                    int  val1 = atoi( Value1_Ptr->Val1);
+                    int  val2 = atoi( Value2_Ptr->Val1);


                    if( val1 < val2)
                    {
-                        return(NDS_LOWER);
+                        return( NDS_LOWER);
                    }
                    else
                    {
                        if( val1 > val2)
                        {
-                            return(NDS_GREATER);
+                            return( NDS_GREATER);
                        }
                        else
                        {
-                            return(NDS_EQUAL);
+                            return( NDS_EQUAL);
                        }
                    }
                }

                case 2:
                {
-                    int  val1 = strlen(Value1_Ptr->Val2);
-                    int  val2 = strlen(Value2_Ptr->Val2);
+                    int  val1 = strlen( Value1_Ptr->Val2);
+                    int  val2 = strlen( Value2_Ptr->Val2);


                    if( val1 < val2)
                    {
-                        return(NDS_LOWER);
+                        return( NDS_LOWER);
                    }
                    else
                    {
                        if( val1 > val2)
                        {
-                            return(NDS_GREATER);
+                            return( NDS_GREATER);
                        }
                        else
                        {
-                            return(NDS_EQUAL);
+                            return( NDS_EQUAL);
                        }
                    }
                }
@@ -323,6 +323,7 @@ NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_No
            */

            Command_Name = "NDD_CMD_VALUE_REMOVE";
+
            return( NDS_OK);
        }

@@ -380,12 +381,12 @@ NDT_Status  Manager_Demo_DS( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_No
        default:
        {
            printf( "Demo_DS_Manager() called with an undefined command %d\n", Command);
-            return NDS_ERRAPI;
+            return( NDS_ERRAPI);
        }
    }

    printf( "Demo_DS_Manager() called with command %d (%s)\n", Command, Command_Name);
-    return NDS_OK;
+    return( NDS_OK);
 }


@@ -492,7 +493,7 @@ void  DataStruct_Dump( NDT_Root  *ds_ptr)

    printf( "Traverse DataStructure Index 0:\n");

-    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDT_CMD_INDEX0_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
+    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDD_CMD_INDEX0_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
    {
        printf( "ND_DataStruct_Traverse() failed (%d) !\n", status);
    }
@@ -503,7 +504,7 @@ void  DataStruct_Dump( NDT_Root  *ds_ptr)

    printf( "Traverse DataStructure Index 1:\n");

-    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDT_CMD_INDEX1_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
+    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDD_CMD_INDEX1_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
    {
        printf( "ND_DataStruct_Traverse() failed (%d) !\n", status);
    }
@@ -514,7 +515,7 @@ void  DataStruct_Dump( NDT_Root  *ds_ptr)

    printf( "Traverse DataStructure Index 2:\n");

-    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDT_CMD_INDEX2_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
+    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDD_CMD_INDEX2_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
    {
        printf( "ND_DataStruct_Traverse() failed (%d) !\n", status);
    }
@@ -525,7 +526,7 @@ void  DataStruct_Dump( NDT_Root  *ds_ptr)

    printf( "Traverse DataStructure Index 3:\n");

-    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDT_CMD_INDEX3_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
+    if( ( status = ND_DataStruct_Traverse( ds_ptr, NDD_CMD_INDEX3_PRINT, stdout, NDD_RECURSIVE_MODE_PARENT, 0)) != NDS_OK)
    {
        printf( "ND_DataStruct_Traverse() failed (%d) !\n", status);
    }
@@ -563,6 +564,16 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
    FILE            *demo_file;


+    printf( "Open library: ");
+
+    if( ( status = ND_Library_Open( NDD_TRUE)) != NDS_OK)
+    {
+        printf( "ND_Library_Open() failed (%d) !\n", status);
+    }
+    else
+    {
+        printf( "Ok !\n");
+
 	printf( "Create demo DataStructure: ");

 	if( Optimized_Mode)
@@ -574,9 +585,7 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
 	    index_type_ptr = index_type_final_tab;
 	}

-
-
-    if( ( status = ND_DataStruct_Open( &demo_ds_ptr, INDEX_NB, index_type_ptr, "Manager_Demo_DS", Manager_Demo_DS, NULL, NULL, NULL, NULL,0,  NULL)) != NDS_OK)
+	if( ( status = ND_DataStruct_Open( &demo_ds_ptr, INDEX_NB, index_type_ptr, "Demo_DS_Manager", Demo_DS_Manager, NULL, NULL, NULL, NULL,0,  NULL)) != NDS_OK)
 	{
 	    printf( "ND_DataStruct_Open() failed (%d) !\n", status);
 	}
@@ -599,16 +608,11 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
 		printf( "\n\n\nLaod Data File:\n\n");
 		DataStruct_Load( demo_ds_ptr, demo_file);
            
-
-            
 		if( Optimized_Mode)
 		{
-
 		    printf( "\n\n\nInitial Structure Dump:\n\n");
 		    DataStruct_Dump( demo_ds_ptr);
            
-
-            
 		    printf( "Convert data structure: ");

 		    if( ( status = ND_DataStruct_Convert( demo_ds_ptr, index_type_final_tab)) != NDS_OK)
@@ -626,8 +630,6 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
 		printf( "\n\n\nFinal Structure Dump:\n\n");
 		DataStruct_Dump( demo_ds_ptr);

-
-
 		printf( "Close demo datafile: ");

 		if( fclose( demo_file) != 0)
@@ -641,7 +643,6 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
 	    }


-
 	    printf( "Close demo DataStructure: ");
    
 	    if( ( status = ND_DataStruct_Close( demo_ds_ptr)) != NDS_OK)
@@ -653,6 +654,18 @@ void Demo( char  *Demo_File_Name, short  Optimized_Mode)
 		printf( "Ok !\n");
 	    }
 	}
+
+        printf( "Close library: ");
+    
+        if( ( status = ND_Library_Close()) != NDS_OK)
+        {
+            printf( "ND_Library_Close() failed (%d) !\n", status);
+        }
+        else
+        {
+            printf( "Ok !\n");
+        }
+    }
 }


@@ -670,34 +683,4 @@ int main( int  argc, char  **argv)

    printf( "\n\n\n\n\nOptimized Demo\n--------------\n\n\n");
    Demo( DEMO_FILE_NAME, 1);
-
-    {
-/*
-        HMODULE my_module;
-        char  buf[256];
-        FARPROC my_function;
-
-        my_module = GetModuleHandle( NULL);
-        printf( "Module_Handle: (%p)\n", my_module);
-
-        buf[0] = '\0';
-        GetModuleFileName( my_module, buf, 255);
-        printf( "Module_Name: (%s)\n", buf);
-        
-        my_function = GetProcAddress( my_module, "zob");
-        printf( "Function_Addr: (%p)\n", my_function);
-
-        my_function();
-*/
-    }
 }
-
-
-
-
-/*
-__declspec(dllexport) void zob(void)
-{
-        printf( "Zoby la mouche qui pête...!!!\n");
-}
-*/
--- a/demo/nddemo0.dat
+++ b/demo/nddemo0.dat
@@ -1,9 +1,9 @@
 #---------------------------------------------------------------------------------
 # $RCSfile: nddemo0.dat,v $								
 #---------------------------------------------------------------------------------
-# $Revision: 2.0 $								
+# $Revision: 2.1 $								
 # $Name:  $									
-# $Date: 2001/11/26 10:53:34 $							
+# $Date: 2003/07/16 00:17:02 $							
 # $Author: agibert $								
 #---------------------------------------------------------------------------------
 ggg	1	xxxxxx	example
--- a/demo/nddemo0.dsp
+++ b/demo/nddemo0.dsp
@@ -1,24 +1,24 @@
-# Microsoft Developer Studio Project File - Name="demo0" - Package Owner=<4>
+# Microsoft Developer Studio Project File - Name="nddemo0" - Package Owner=<4>
 # Microsoft Developer Studio Generated Build File, Format Version 6.00
 # ** DO NOT EDIT **

 # TARGTYPE "Win32 (x86) Console Application" 0x0103

-CFG=demo0 - Win32 Debug
+CFG=nddemo0 - Win32 Debug
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
-!MESSAGE NMAKE /f "demo0.mak".
+!MESSAGE NMAKE /f "nddemo0.mak".
 !MESSAGE 
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "demo0.mak" CFG="demo0 - Win32 Debug"
+!MESSAGE NMAKE /f "nddemo0.mak" CFG="nddemo0 - Win32 Debug"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
-!MESSAGE "demo0 - Win32 Release" (based on "Win32 (x86) Console Application")
-!MESSAGE "demo0 - Win32 Debug" (based on "Win32 (x86) Console Application")
+!MESSAGE "nddemo0 - Win32 Release" (based on "Win32 (x86) Console Application")
+!MESSAGE "nddemo0 - Win32 Debug" (based on "Win32 (x86) Console Application")
 !MESSAGE 

 # Begin Project
@@ -28,7 +28,7 @@ CFG=demo0 - Win32 Debug
 CPP=cl.exe
 RSC=rc.exe

-!IF  "$(CFG)" == "demo0 - Win32 Release"
+!IF  "$(CFG)" == "nddemo0 - Win32 Release"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 0
@@ -52,7 +52,7 @@ LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386
 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnode.lib /nologo /subsystem:console /incremental:yes /machine:I386

-!ELSEIF  "$(CFG)" == "demo0 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nddemo0 - Win32 Debug"

 # PROP BASE Use_MFC 0
 # PROP BASE Use_Debug_Libraries 1
@@ -74,24 +74,24 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnoded.lib /nologo /subsystem:console /debug /machine:I386 /out:"demo0d.exe" /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib libnoded.lib /nologo /subsystem:console /debug /machine:I386 /out:"nddemo0d.exe" /pdbtype:sept

 !ENDIF 

 # Begin Target

-# Name "demo0 - Win32 Release"
-# Name "demo0 - Win32 Debug"
+# Name "nddemo0 - Win32 Release"
+# Name "nddemo0 - Win32 Debug"
 # Begin Group "Source Files"

 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File

-SOURCE=.\demo0.c
+SOURCE=.\nddemo0.c

-!IF  "$(CFG)" == "demo0 - Win32 Release"
+!IF  "$(CFG)" == "nddemo0 - Win32 Release"

-!ELSEIF  "$(CFG)" == "demo0 - Win32 Debug"
+!ELSEIF  "$(CFG)" == "nddemo0 - Win32 Debug"

 # ADD CPP /MDd

--- a/demo/nddemo0.dsw
+++ b/demo/nddemo0.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00

 ###############################################################################

-Project: "demo0"=.\demo0\demo0.dsp - Package Owner=<4>
+Project: "nddemo0"=.\nddemo0.dsp - Package Owner=<4>

 Package=<5>
 {{{
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -0,0 +1,5 @@
+FILE_DOC := libnode.doc
+FILE_MAN := man3
+
+include ../Makefile.var
+include ../Makefile.rule
--- a/include/Makefile
+++ b/include/Makefile
@@ -0,0 +1,6 @@
+FILE_INCLUDE := node.h
+
+
+
+include ../Makefile.var
+include ../Makefile.rule
--- a/include/node.h
+++ b/include/node.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: node.h,v $					       			   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.5 $															   */
+/* $Revision: 2.12 $			      					   */
 /* $Name:  $									   */
-/* $Date: 2002/02/28 21:53:47 $													   */
+/* $Date: 2005/01/20 00:00:25 $							   */
 /* $Author: agibert $								   */
 /*---------------------------------------------------------------------------------*/

@@ -21,7 +21,7 @@
 /*    GNU Lesser General Public License for more details.                          */
 /*                                                                                 */
 /*    You should have received a copy of the GNU Lesser General Public License     */
-/*    along with Foobar; if not, write to the Free Software                        */
+/*    along with LibNode; if not, write to the Free Software                       */
 /*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    */
 /*---------------------------------------------------------------------------------*/

@@ -31,21 +31,20 @@


 #ifndef _LIBNODE_H_
-#define _LIBNODE_H_
+#   define _LIBNODE_H_

-#ifdef __cplusplus
+#   ifdef __cplusplus
 extern "C" {
-#endif
+#   endif

-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <signal.h>
-#include <stdarg.h>
+#   include <stdlib.h>
+#   include <stdio.h>
+#   include <string.h>
+#   include <stdarg.h>

-#ifdef _LIBVER_SUPPORT
+#   ifdef _LIBVER_SUPPORT
 #       include <ver.h>
-#endif
+#   endif



@@ -227,7 +226,7 @@ typedef NDT_Status NDT_Manager( struct NDT_Root  *, NDT_Index_Id, struct NDT_Nod

 typedef char  *NDT_Allocator_Name;

-typedef NDT_Status NDT_Allocator(size_t, void **, void *);
+typedef NDT_Status  NDT_Allocator( void **, size_t, void *);


 /* Pointeur de fonction sur le désallocateur */
@@ -237,7 +236,7 @@ typedef NDT_Status NDT_Allocator(size_t, void **, void *);

 typedef char  *NDT_Desallocator_Name;

-typedef NDT_Status NDT_Desallocator(void *, void *);
+typedef NDT_Status  NDT_Desallocator( void *, void *);



@@ -251,9 +250,9 @@ typedef struct NDT_Index
 	long              Max_Depth;          /* Profondeur maximale de l'arbre */
 	long              Max_Dif;            /* Différence maximale autorisée entre la branche la plus courte et la plus longue */
 	long              Nb_Equ;             /* Nombre de réquilibrages réalisés sur l'arbre */
-	struct NDT_Node *     Head;               /* Noeud de tête */
-	struct NDT_Node *     Tail;              /* Noeud de queue */
-	struct NDT_Node *     Save;               /* Pointeur de sauvegarde (utile pour la fonction de restauration) */
+	struct NDT_Node  *Head;               /* Noeud de tête */
+	struct NDT_Node  *Tail;              /* Noeud de queue */
+	struct NDT_Node  *Save;               /* Pointeur de sauvegarde (utile pour la fonction de restauration) */

 } NDT_Index;

@@ -261,8 +260,8 @@ typedef struct NDT_Index

 typedef struct NDT_Root
 {
-//	NDT_Root_Type		  Type;				/* Root Structure Type */
-//	NDT_DataStruct_Type   DS_Type;			/* Type de la structure (liste, arbre ... ) */
+/*	NDT_Root_Type		  Type;*/				/* Root Structure Type */
+/*	NDT_DataStruct_Type   DS_Type;*/			/* Type de la structure (liste, arbre ... ) */

 	NDT_Manager       *Manager_Ptr;									 /* Pointeur sur la fonction manager */
 	char               Manager_Name[NDD_MANAGER_NAME_SIZE_MAX];		 /* Nom de la fonction manager */
@@ -272,11 +271,11 @@ typedef struct NDT_Root
 	char               Desallocator_Name[NDD_DESALLOCATOR_NAME_SIZE_MAX]; /* Nom de la fonction de désallocation */

 	short              Own_Value;              /* Indique si la structure est propriétaire de ses valeurs */
-    void              *User;                   /* Pointeur utilisable librement par l'utilisateur */
+	void              *User_Ptr;               /* Pointeur utilisable librement par l'utilisateur */

 	NDT_Index_Nb       Index_Nb;
 	NDT_Index_Nb       Index_Open_Count;
-    NDT_Index          Index_Tab[0];
+	NDT_Index          Index_Tab[1];

 } NDT_Root;

@@ -309,10 +308,6 @@ typedef struct NDT_Node



-char ND_Error_Msg [512];
-
-
-
 typedef int  NDT_Recursive_Mode;
 typedef int  NDT_Recursive_Depth;
 typedef int  NDT_Recursive_Offset;
@@ -339,7 +334,7 @@ typedef int  NDT_Recursive_Offset;

 #define ND_Library_Open             ND_Library_Open_I
 #define ND_Library_Close            ND_Library_Close_I
-#define ND_Library_Stderr_Set       ND_Library_Stderr_Set_I
+#define ND_Library_StdErr_Set       ND_Library_StdErr_Set_I

 #define ND_DataStruct_Open          ND_DataStruct_Open_I
 #define ND_DataStruct_Close         ND_DataStruct_Close_I
@@ -389,7 +384,7 @@ typedef int  NDT_Recursive_Offset;

 #define ND_Library_Open             ND_Library_Open_C
 #define ND_Library_Close            ND_Library_Close_C
-#define ND_Library_Stderr_Set       ND_Library_Stderr_Set_C
+#define ND_Library_StdErr_Set       ND_Library_StdErr_Set_C

 #define ND_DataStruct_Open          ND_DataStruct_Open_C
 #define ND_DataStruct_Close         ND_DataStruct_Close_C
@@ -441,7 +436,7 @@ typedef int  NDT_Recursive_Offset;

 /*------------------------------------------------------------------------------*/

-#	if defined(_MSC_VER) && !defined(LIBNODE_STATIC)
+#	if defined(_WIN32) && !defined(LIBNODE_STATIC)
 #		ifndef _LIBNODE_C_
 #			define NDD_DLL_API __declspec(dllimport)
 #		else
@@ -472,8 +467,8 @@ NDD_DLL_API NDT_Status  ND_Library_Close_C( void);
 /*------------------------------------------------------------------------------*/
 /* Définition de la sortie standard des messages d'erreur de la librairie       */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Library_Stderr_Set_I( FILE  *Out);
-NDD_DLL_API NDT_Status  ND_Library_Stderr_Set_C( FILE  *Out);
+NDD_DLL_API NDT_Status  ND_Library_StdErr_Set_I( FILE  *);
+NDD_DLL_API NDT_Status  ND_Library_StdErr_Set_C( FILE  *);



@@ -497,8 +492,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Open_C( NDT_Root  **, NDT_Index_Nb, NDT_In
 /*------------------------------------------------------------------------------*/
 /* (O) Root: pointeur sur la racine de la structure de données                  */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Close_I( NDT_Root  *Root);
-NDD_DLL_API NDT_Status  ND_DataStruct_Close_C( NDT_Root  *Root);
+NDD_DLL_API NDT_Status  ND_DataStruct_Close_I( NDT_Root  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Close_C( NDT_Root  *);



@@ -507,8 +502,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Close_C( NDT_Root  *Root);
 /*------------------------------------------------------------------------------*/
 /* (O) Root: pointeur sur la racine de la structure de données                  */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Flush_I( NDT_Root  *Root);
-NDD_DLL_API NDT_Status  ND_DataStruct_Flush_C( NDT_Root  *Root);
+NDD_DLL_API NDT_Status  ND_DataStruct_Flush_I( NDT_Root  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Flush_C( NDT_Root  *);



@@ -522,8 +517,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Flush_C( NDT_Root  *Root);
 /* (O) Nb_Corrected : pointeur sur le nombre d'erreurs                          */
 /* (I) Out          : flux de sortie du rapport                                 */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Check_I( NDT_Root  *Root, int  *Nb_Detected, int  *Nb_Corrected, FILE  *Out);
-NDD_DLL_API NDT_Status  ND_DataStruct_Check_C( NDT_Root  *Root, int  *Nb_Detected, int  *Nb_Corrected, FILE  *Out);
+NDD_DLL_API NDT_Status  ND_DataStruct_Check_I( NDT_Root  *, int  *, int  *, FILE  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Check_C( NDT_Root  *, int  *, int  *, FILE  *);



@@ -534,8 +529,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Check_C( NDT_Root  *Root, int  *Nb_Detecte
 /*------------------------------------------------------------------------------*/
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Reorg_I( NDT_Root  *Root);
-NDD_DLL_API NDT_Status  ND_DataStruct_Reorg_C( NDT_Root  *Root);
+NDD_DLL_API NDT_Status  ND_DataStruct_Reorg_I( NDT_Root  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Reorg_C( NDT_Root  *);



@@ -558,10 +553,10 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Convert_C( NDT_Root  *, NDT_Index_Type  *)
 /* (I) Command: Commande à exécuter sur chaque noeud traversé                   */
 /* (I) Data: pointeur de données utilisateur                                    */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_VI( NDT_Root  *, NDT_Command  Command, va_list);
-NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_VC( NDT_Root  *, NDT_Command  Command, va_list);
-NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_I( NDT_Root  *, NDT_Command  Command, ...);
-NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_C( NDT_Root  *, NDT_Command  Command, ...);
+NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_VI( NDT_Root  *, NDT_Command, va_list);
+NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_VC( NDT_Root  *, NDT_Command, va_list);
+NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_I(  NDT_Root  *, NDT_Command, ...);
+NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_C(  NDT_Root  *, NDT_Command, ...);



@@ -571,8 +566,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_C( NDT_Root  *, NDT_Command  Comm
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /* (I) Out : flux de sortie                                                     */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Info_Print_I( FILE  *, NDT_Root  *Root, NDT_Recursive_Mode  Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
-NDD_DLL_API NDT_Status  ND_DataStruct_Info_Print_C( FILE  *, NDT_Root  *Root, NDT_Recursive_Mode  Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
+NDD_DLL_API NDT_Status  ND_DataStruct_Info_Print_I( FILE  *, NDT_Root  *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);
+NDD_DLL_API NDT_Status  ND_DataStruct_Info_Print_C( FILE  *, NDT_Root  *, NDT_Recursive_Mode, NDT_Recursive_Depth, NDT_Recursive_Offset);



@@ -582,8 +577,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Info_Print_C( FILE  *, NDT_Root  *Root, ND
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /* (I) Value: pointeur sur la valeur à ajouter                                  */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Add_I( NDT_Root  *Root, void  *Value);
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Add_C( NDT_Root  *Root, void  *Value);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Add_I( NDT_Root  *, void  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Add_C( NDT_Root  *, void  *);



@@ -594,8 +589,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Value_Add_C( NDT_Root  *Root, void  *Value
 /* (I) Reference_Value : pointeur sur la valeur de référence                    */
 /* (I) Removed_Value   : adresse d'un pointeur sur la valeur supprimée          */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Remove_I( NDT_Root  *Root, void  *Value);
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Remove_C( NDT_Root  *Root, void  *Value);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Remove_I( NDT_Root  *, void  *);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Remove_C( NDT_Root  *, void  *);



@@ -620,10 +615,10 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Value_Print_C( FILE  *, NDT_Root  *, NDT_R
 /* (I) Data  : pointeur de données                                              */
 /*------------------------------------------------------------------------------*/

-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_VI( void  **Value_Ptr_Ptr, NDT_Root  *Root_Ptr, void  *Ref_Value_Ptr, va_list);
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_VC( void  **Value_Ptr_Ptr, NDT_Root  *Root_Ptr, void  *Ref_Value_Ptr, va_list);
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_I( void  **Value_Ptr_Ptr, NDT_Root  *Root_Ptr, void  *Ref_Value_Ptr, ...);
-NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_C( void  **Value_Ptr_Ptr, NDT_Root  *Root_Ptr, void  *Ref_Value_Ptr, ...);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_VI( void  **, NDT_Root  *, void  *, va_list);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_VC( void  **, NDT_Root  *, void  *, va_list);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_I(  void  **, NDT_Root  *, void  *, ...);
+NDD_DLL_API NDT_Status  ND_DataStruct_Value_Find_C(  void  **, NDT_Root  *, void  *, ...);



@@ -672,8 +667,8 @@ NDD_DLL_API NDT_Status  ND_Index_Flush_C( NDT_Root  *, NDT_Index_Id);
 /* (O) Nb_Corrected : pointeur sur le nombre d'erreurs                          */
 /* (I) Out          : flux de sortie du rapport                                 */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Check_I( NDT_Root  *Root, NDT_Index_Id, int  *, int  *, FILE  *);
-NDD_DLL_API NDT_Status  ND_Index_Check_C( NDT_Root  *Root, NDT_Index_Id, int  *, int  *, FILE  *);
+NDD_DLL_API NDT_Status  ND_Index_Check_I( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);
+NDD_DLL_API NDT_Status  ND_Index_Check_C( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);



@@ -683,8 +678,8 @@ NDD_DLL_API NDT_Status  ND_Index_Check_C( NDT_Root  *Root, NDT_Index_Id, int  *,
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /* (I) Target_Type: type de structure cible                                     */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Convert_I ( NDT_Root  *, NDT_Index_Id  Index_Id, NDT_Index_Type);
-NDD_DLL_API NDT_Status  ND_Index_Convert_C ( NDT_Root  *, NDT_Index_Id  Index_Id, NDT_Index_Type);
+NDD_DLL_API NDT_Status  ND_Index_Convert_I ( NDT_Root  *, NDT_Index_Id, NDT_Index_Type);
+NDD_DLL_API NDT_Status  ND_Index_Convert_C ( NDT_Root  *, NDT_Index_Id, NDT_Index_Type);



@@ -734,8 +729,8 @@ NDD_DLL_API NDT_Status  ND_Index_Info_Print_C( FILE  *, NDT_Root  *, NDT_Index_I
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /* (I) Value: pointeur sur la valeur à ajouter                                  */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Value_Add_I( NDT_Root  *Root, NDT_Index_Id, void  *Value);
-NDD_DLL_API NDT_Status  ND_Index_Value_Add_C( NDT_Root  *Root, NDT_Index_Id, void  *Value);
+NDD_DLL_API NDT_Status  ND_Index_Value_Add_I( NDT_Root  *, NDT_Index_Id, void  *);
+NDD_DLL_API NDT_Status  ND_Index_Value_Add_C( NDT_Root  *, NDT_Index_Id, void  *);



@@ -746,8 +741,8 @@ NDD_DLL_API NDT_Status  ND_Index_Value_Add_C( NDT_Root  *Root, NDT_Index_Id, voi
 /* (I) Reference_Value : pointeur sur la valeur de référence                    */
 /* (I) Removed_Value   : adresse d'un pointeur sur la valeur supprimée          */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Value_Remove_I( NDT_Root  *Root, NDT_Index_Id, void  *Value);
-NDD_DLL_API NDT_Status  ND_Index_Value_Remove_C( NDT_Root  *Root, NDT_Index_Id, void  *Value);
+NDD_DLL_API NDT_Status  ND_Index_Value_Remove_I( NDT_Root  *, NDT_Index_Id, void  *);
+NDD_DLL_API NDT_Status  ND_Index_Value_Remove_C( NDT_Root  *, NDT_Index_Id, void  *);



@@ -769,8 +764,8 @@ NDD_DLL_API NDT_Status  ND_Index_Value_Print_C( FILE  *, NDT_Root  *, NDT_Index_
 /* (I) Root: pointeur sur la racine de la structure de données                  */
 /* (I) Node: pointeur sur le noeud à ajouter                                    */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Node_Add_I( NDT_Root * Root, NDT_Index_Id  Index_Id, NDT_Node * Node );
-NDD_DLL_API NDT_Status  ND_Index_Node_Add_C( NDT_Root * Root, NDT_Index_Id  Index_Id, NDT_Node * Node );
+NDD_DLL_API NDT_Status  ND_Index_Node_Add_I( NDT_Root  *, NDT_Index_Id, NDT_Node  *);
+NDD_DLL_API NDT_Status  ND_Index_Node_Add_C( NDT_Root  *, NDT_Index_Id, NDT_Node  *);



@@ -779,8 +774,8 @@ NDD_DLL_API NDT_Status  ND_Index_Node_Add_C( NDT_Root * Root, NDT_Index_Id  Inde
 /*------------------------------------------------------------------------------*/
 /* (I) Node: pointeur sur le noeud à supprimer de la structure de données       */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Index_Node_Remove_I( NDT_Node * Node);
-NDD_DLL_API NDT_Status  ND_Index_Node_Remove_C( NDT_Node * Node);
+NDD_DLL_API NDT_Status  ND_Index_Node_Remove_I( NDT_Node  *);
+NDD_DLL_API NDT_Status  ND_Index_Node_Remove_C( NDT_Node  *);



@@ -897,8 +892,8 @@ NDD_DLL_API NDT_Status  ND_Manager_Exec_C( NDT_Root  *, NDT_Index_Id, NDT_Node
 /* (I) Size : taille de la zone à allouer                                       */
 /* (I) Data : pointeur de données utiles à l'allocateur                         */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Allocator_Exec_I( NDT_Allocator  *, void  **, size_t, void  *);
-NDD_DLL_API NDT_Status  ND_Allocator_Exec_C( NDT_Allocator  *, void  **, size_t, void  *);
+NDD_DLL_API NDT_Status  ND_Allocator_Exec_I( void  **, size_t, NDT_Allocator_Name, NDT_Allocator  *, void  *);
+NDD_DLL_API NDT_Status  ND_Allocator_Exec_C( void  **, size_t, NDT_Allocator_Name, NDT_Allocator  *, void  *);



@@ -906,16 +901,17 @@ NDD_DLL_API NDT_Status  ND_Allocator_Exec_C( NDT_Allocator  *, void  **, size_t,
 /* Exécution d'une fonction de désallocation le dont nom est passé en paramètre */
 /*------------------------------------------------------------------------------*/
 /* (I) Function : nom de la fonction à exécuter                                 */
+/* (I) Function : nom de la fonction à exécuter                                 */
 /* (I) Ptr : adresse de la zone à désallouer                                    */
 /* (I) Data : pointeur de données utiles au désallocateur                       */
 /*------------------------------------------------------------------------------*/
-NDD_DLL_API NDT_Status  ND_Desallocator_Exec_I( NDT_Desallocator  *, void  *, void  *);
-NDD_DLL_API NDT_Status  ND_Desallocator_Exec_C( NDT_Desallocator  *, void  *, void  *);
+NDD_DLL_API NDT_Status  ND_Desallocator_Exec_I( void  *, NDT_Desallocator_Name, NDT_Desallocator  *, void  *);
+NDD_DLL_API NDT_Status  ND_Desallocator_Exec_C( void  *, NDT_Desallocator_Name, NDT_Desallocator  *, void  *);



-#ifdef __cplusplus
+#   ifdef __cplusplus
 }
-#endif
+#   endif

 #endif
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,18 +1,22 @@
+SRC          := libnode.c
+TARGETS      := libnode.a libnode.so
+FILE_LIB     := libnode.a libnode.so
+
+
+
+include ../Makefile.var
+include ../Makefile.rule
+
+
+
+DEP     += libnode.h ../include/node.h Makefile
+INCLUDE += -I . -I ../include
+
 ifdef _LIBVER_SUPPORT
-	INCLUDE_VER = ../../libver/ver.h
-	LIB_VER     = -I ../../libver
+	DEP     += ../../libver/ver.h
+	INCLUDE += -I ../../libver/lib
 endif

-all: libnode.a libnode.so

-libnode.o: libnode.c node.h libnode.h $(INCLUDE_VER) Makefile
-	gcc -c -g -o libnode.o -I . $(LIB_VER) libnode.c

-libnode.a: libnode.o
-	ar -r libnode.a libnode.o
-
-libnode.so: libnode.o
-	ld -shared -o libnode.so libnode.o
-
-clean:
-	rm -f libnode.o libnode.a libnode.so
+libnode.o : libnode.c $(DEP)
--- a/lib/libnode.c
+++ b/lib/libnode.c
--- a/lib/libnode.dsp
+++ b/lib/libnode.dsp
@@ -126,7 +126,7 @@ SOURCE=.\libnode.h
 # End Source File
 # Begin Source File

-SOURCE=.\node.h
+SOURCE=..\include\node.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"
--- a/lib/libnode.h
+++ b/lib/libnode.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: libnode.h,v $							   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.3 $															   */
+/* $Revision: 2.9 $								   */
 /* $Name:  $									   */
-/* $Date: 2002/02/28 21:53:47 $													   */
+/* $Date: 2005/01/19 23:59:42 $							   */
 /* $Author: agibert $							           */
 /*---------------------------------------------------------------------------------*/

@@ -21,7 +21,7 @@
 /*    GNU Lesser General Public License for more details.                          */
 /*                                                                                 */
 /*    You should have received a copy of the GNU Lesser General Public License     */
-/*    along with Foobar; if not, write to the Free Software                        */
+/*    along with LibNode; if not, write to the Free Software                       */
 /*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    */
 /*---------------------------------------------------------------------------------*/

@@ -29,11 +29,20 @@



-#include <stdio.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <string.h>
+#include <errno.h>
 #include <signal.h>
-//#include <dlfcn.h>
+#include <setjmp.h>
+#include <dlfcn.h>
+
+
+
+/* Utilisation des API de la LIBNODE sans vérification des arguments */
+
+#define ND_MODE 1
+
 #include <node.h>


@@ -43,39 +52,69 @@


 #ifdef __linux
-
 #   define NDD_PRINTF_PTR_PREFIX  ""
-
 #else
-
 #   define NDD_PRINTF_PTR_PREFIX  "0x"
-
 #endif





-#define NDD_HUGE_LONG (long)0xFFFFFFL
+#define NDD_HUGE_LONG ( long) 0xFFFFFFL

-/* Sortie standard des messages d'erreur */

-FILE * ND_stderr;

 /* Table des symboles locale */

-struct Symbol {
-    void *          Ptr;
-    char *          Name;
-    struct Symbol * Next;
-} * Symbol_Table = NULL;
+struct NDT_Symbol;
+
+typedef struct NDT_Symbol
+{
+	void               *Ptr;
+	char               *Name;
+	struct NDT_Symbol  *Next;
+} NDT_Symbol;
+
+
+
+/* LibNode Global Base Structure */
+
+typedef struct NDT_Base
+{
+	int              Open_Status;
+	int              Debug_Mode;
+	char             Err_String[512];
+	FILE            *Err_Stream;
+	int              Sig_Trapped;
+#if !defined(_WIN32)
+	sigjmp_buf       SigLongJmp_Env;
+#else
+	jmp_buf          SigLongJmp_Env;
+#endif
+	NDT_Symbol      *Symbol_First_Ptr;
+	void            *DL_Ptr;
+	NDT_Index_Type   OpenStruct_Index_Type[1];
+	NDT_Root        *OpenStruct_Ptr;
+} NDT_Base;
+
+NDT_Base  NDG_Base = 
+{
+    NDD_FALSE,
+    NDD_TRUE,
+    "",
+    (FILE *) -1,
+    0,
+    {0},
+    (NDT_Symbol  *) NULL,
+    NULL,
+    { NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO},
+    (NDT_Root  *)   NULL
+};
+

-NDT_Root * Tmp_Root;

-//extern char * strdup (const char *);
-//extern int sigrelse (int sig);

-int Sig_Trapped;

 /*------------------------------------------------------------------------------*/
 /*------------------------------------------------------------------------------*/
@@ -88,12 +127,19 @@ int Sig_Trapped;
 /*------------------------------------------------------------------------------*/
 /* (I) va_list Arguments : Liste d'arguments contextuels                        */
 /*------------------------------------------------------------------------------*/
-NDT_Status  Default_Manager( NDT_Root  *, NDT_Index_Id, NDT_Command, va_list);
+NDT_Status  ND_Default_Manager( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_Command, va_list);
+
+/*------------------------------------------------------------------------------*/
+/* OpenStruct Manager                                                           */
+/*------------------------------------------------------------------------------*/
+/* (I) va_list Arguments : Liste d'arguments contextuels                        */
+/*------------------------------------------------------------------------------*/
+NDT_Status  ND_OpenStruct_Manager( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_Command, va_list);

 /*------------------------------------------------------------------------------*/
 /* Redéfinition de la fonction malloc() avec retour de type NDT_Status          */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Default_Allocator( size_t Size, void  **ptr, void  *User);
+NDT_Status  ND_Default_Allocator( void  **, size_t, void  *);

 /*------------------------------------------------------------------------------*/
 /* Redéfinition de la fonction free() avec retour de type NDT_Status            */
@@ -106,7 +152,7 @@ NDT_Status ND_Default_Desallocator( void  *, void  *);
 /* (I) Root     : adresse de la racine pour laquelle on crée un noeud           */
 /* (O) New_Node : adresse du pointeur sur le nouveau noeud                      */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Node_Alloc (NDT_Root * Root, NDT_Node ** New_Node);
+NDT_Status ND_Node_Alloc( NDT_Root * Root, NDT_Node ** New_Node);

 /*------------------------------------------------------------------------------*/
 /* Destruction d'un noeud                                                       */
@@ -114,7 +160,19 @@ NDT_Status ND_Node_Alloc (NDT_Root * Root, NDT_Node ** New_Node);
 /* (I) Root : adresse de la racine dans laquelle on détruit un noeud            */
 /* (I) Node : pointeur sur le noeud à détruire                                  */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Node_Free (NDT_Root * Root, NDT_Node * Node);
+NDT_Status  ND_Node_Free( NDT_Root  *, NDT_Node  *);
+
+/*------------------------------------------------------------------------------*/
+/* Création d'une nouvelle structure de données                                 */
+/*------------------------------------------------------------------------------*/
+/* (O) Root: adresse d'un pointeur sur la racine de la nouvelle structure       */
+/* (I) Type: type de la structure.de données (liste ou arbre binaire)           */
+/* (I) Allocator: pointeur vers la fonction d'allocation                        */
+/* (I) Desallocator: pointeur vers la fonction de désallocation                 */
+/* (I) Data : pointeur de données utiles à l'allocateur                         */
+/* (I) Own_Value : indique si la structure est propriétaire de ses valeurs      */
+/*------------------------------------------------------------------------------*/
+NDT_Status  ND_Index_Clear( NDT_Root  *, NDT_Index_Id);

 /*------------------------------------------------------------------------------*/
 /* Création de la racine d'une structure de données quelconque                  */
@@ -132,7 +190,7 @@ NDT_Status  ND_Node_Root_Alloc( NDT_Root  **, NDT_Index_Nb, NDT_Index_Type[], ch
 /*------------------------------------------------------------------------------*/
 /* (I) Root : pointeur sur la racine à détruire                                 */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Node_Root_Free (NDT_Root * Root);
+NDT_Status  ND_Node_Root_Free( NDT_Root  *);

 /*------------------------------------------------------------------------------*/
 /* Ajout d'un noeud à une liste chaînée                                         */
@@ -140,7 +198,7 @@ NDT_Status ND_Node_Root_Free (NDT_Root * Root);
 /* (I) Root     : pointeur sur la racine de la liste                            */
 /* (I) New_Node : pointeur sur le noeud à ajouter                               */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_List_Node_Add (NDT_Root  *, NDT_Index_Id, NDT_Node  *);
+NDT_Status  ND_List_Node_Add( NDT_Root  *, NDT_Index_Id, NDT_Node  *);

 /*------------------------------------------------------------------------------*/
 /* Ajout d'une nouvelle valeur à une liste                                      */
@@ -148,7 +206,7 @@ NDT_Status ND_List_Node_Add (NDT_Root  *, NDT_Index_Id, NDT_Node  *);
 /* (I) Root     : pointeur sur la racine de la liste                            */
 /* (I) Value    : pointeur sur la valeur à ajouter                              */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_List_Value_Add (NDT_Root  *, NDT_Index_Id, void  *);
+NDT_Status  ND_List_Value_Add( NDT_Root  *, NDT_Index_Id, void  *);

 /*------------------------------------------------------------------------------*/
 /* Ajout d'un noeud à un arbre binaire                                          */
@@ -156,26 +214,26 @@ NDT_Status ND_List_Value_Add (NDT_Root  *, NDT_Index_Id, void  *);
 /* (I) Root     : pointeur sur la racine de l'arbre                             */
 /* (I) Value    : pointeur sur la valeur à ajouter                              */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Tree_Value_Add (NDT_Root  *, NDT_Index_Id, void  *);
+NDT_Status  ND_Tree_Value_Add( NDT_Root  *, NDT_Index_Id, void  *);

 /*------------------------------------------------------------------------------*/
 /* Supprime le noeud d'une liste                                                */
 /*------------------------------------------------------------------------------*/
 /* (I) Node  : pointeur sur le noeud à supprimer                                */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_List_Node_Remove (NDT_Node  *);
+NDT_Status  ND_List_Node_Remove( NDT_Node  *);

 /*------------------------------------------------------------------------------*/
 /* Conversion d'une structure en liste chaînée                                  */
 /*------------------------------------------------------------------------------*/
 /* (I) Root : pointeur sur la racine du la structure à convertir                */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_List_Make (NDT_Root  *, NDT_Index_Id);
+NDT_Status  ND_List_Make( NDT_Root  *, NDT_Index_Id);

 /*------------------------------------------------------------------------------*/
 /* Recherche une valeur dans une liste et retourne le noeud correspondant       */
 /*------------------------------------------------------------------------------*/
-NDT_Node * ND_List_Node_Find (NDT_Root  *, NDT_Index_Id, void  *, va_list);
+NDT_Node  *ND_List_Node_Find( NDT_Root  *, NDT_Index_Id, void  *, va_list);

 /*------------------------------------------------------------------------------*/
 /* Recherche un noeud dans un arbre et retourne le pointeur sur le noeud        */
@@ -188,28 +246,28 @@ NDT_Node  *ND_Tree_Node_Find( NDT_Root *, NDT_Index_Id, void  *, va_list);
 /* (I) Root : pointeur sur la racine du la structure à convertir                */
 /* (I) Type : type du futur arbre                                               */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Tree_Make (NDT_Root  *, NDT_Index_Id);
+NDT_Status  ND_Tree_Make( NDT_Root  *, NDT_Index_Id);

 /*------------------------------------------------------------------------------*/
 /* Equilibrage d'un arbre                                                       */
 /*------------------------------------------------------------------------------*/
 /* (I) Root : pointeur sur la racine de l'arbre                                 */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Tree_Equalize (NDT_Root  *, NDT_Index_Id);
+NDT_Status  ND_Tree_Equalize( NDT_Root  *, NDT_Index_Id);

 /*------------------------------------------------------------------------------*/
 /* Retourne la profondeur de la plus grande branche à partir d'un noeud         */
 /*------------------------------------------------------------------------------*/
 /* (I) Node : pointeur sur le noeud                                             */
 /*------------------------------------------------------------------------------*/
-long ND_Tree_MaxDepth_Get (NDT_Node  *Node);
+long  ND_Tree_MaxDepth_Get( NDT_Node  *);

 /*------------------------------------------------------------------------------*/
 /* Retourne la profondeur de la plus petite branche à partir d'un noeud         */
 /*------------------------------------------------------------------------------*/
 /* (I) Node : pointeur sur le noeud                                             */
 /*------------------------------------------------------------------------------*/
-long ND_Tree_MinDepth_Get (NDT_Node  *Node);
+long  ND_Tree_MinDepth_Get( NDT_Node  *);

 /*------------------------------------------------------------------------------*/
 /* Ajout d'un noeud à un arbre binaire                                          */
@@ -217,7 +275,7 @@ long ND_Tree_MinDepth_Get (NDT_Node  *Node);
 /* (I) Root    : pointeur sur la racine de l'arbre                              */
 /* (I) Node : pointeur sur le noeud à ajouter                                   */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Tree_Node_Add (NDT_Root  *, NDT_Index_Id, NDT_Node  *);
+NDT_Status  ND_Tree_Node_Add( NDT_Root  *, NDT_Index_Id, NDT_Node  *);

 /*------------------------------------------------------------------------------*/
 /* Ajoute tous les noeud d'une liste à un arbre                                 */
@@ -225,60 +283,65 @@ NDT_Status ND_Tree_Node_Add (NDT_Root  *, NDT_Index_Id, NDT_Node  *);
 /* (I) Tree_Root : pointeur sur la racine de l'arbre                            */
 /* (I) List_Root : pointeur sur la racine de la liste                           */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_Tree_List_Add (NDT_Root *, NDT_Index_Id, NDT_Root  *, NDT_Index_Id);
+NDT_Status  ND_Tree_List_Add( NDT_Root  *, NDT_Index_Id, NDT_Root  *, NDT_Index_Id);

 /*------------------------------------------------------------------------------*/
 /* Fonction de comparaison de noeuds (pour le quick sort)                       */
 /*------------------------------------------------------------------------------*/
-int ND_Node_Compare (void ** Node1, void ** Node2);
+int  ND_Node_Compare( void  **, void  **);

 /*------------------------------------------------------------------------------*/
 /* Ordonne une liste chaînée selon l'algorithme du tri à bulle                  */
 /*------------------------------------------------------------------------------*/
 /* (I) Root : pointeur sur la racine de la liste à trier                        */
 /*------------------------------------------------------------------------------*/
-NDT_Status ND_List_Sort (NDT_Root  *, NDT_Index_Id);
+NDT_Status  ND_List_Sort( NDT_Root  *, NDT_Index_Id);
+
+
+
+
+

 /*------------------------------------------------------------------------------*/
 /*------------------------------------------------------------------------------*/
-/*       Fonctions et procédures privées de la librairie  (bas niveau)          */
+/*                              PRIVATE FUNCTIONS                               */
 /*------------------------------------------------------------------------------*/
 /*------------------------------------------------------------------------------*/

-void ND_List_Check (NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
+void  ND_List_Check( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);

-void ND_List_Link_Check (NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
+void  ND_List_Link_Check( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);

-void ND_Value_Check (NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
+void  ND_Value_Check( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);

-void ND_Tree_Check (NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
+void  ND_Tree_Check( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);

-void ND_Tree_Link_Check (NDT_Root *, NDT_Index_Id, int *, int *, FILE *);
+void  ND_Tree_Link_Check( NDT_Root  *, NDT_Index_Id, int  *, int  *, FILE  *);

-NDT_Status ND_List_Recursive_Make (NDT_Node *, NDT_Root *, NDT_Index_Id);
+NDT_Status  ND_List_Recursive_Make( NDT_Node  *, NDT_Root  *, NDT_Index_Id);

-NDT_Node * ND_Tree_Recursive_Make (long, long, NDT_Node *);
+NDT_Node  *ND_Tree_Recursive_Make( long, long, NDT_Node  *);

 void  ND_Tree_Node_Recursive_Add( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_Node  **, long , NDT_Node  *);

-NDT_Node * ND_Tree_Node_First_Recursive_Get (NDT_Node * Node);
+NDT_Node  *ND_Tree_Node_First_Recursive_Get( NDT_Node  *);

-NDT_Node * ND_Tree_Node_Last_Recursive_Get (NDT_Node * Node);
+NDT_Node  *ND_Tree_Node_Last_Recursive_Get( NDT_Node  *);

-NDT_Node * ND_Tree_Node_Recursive_Find (NDT_Node * Node, void * Value, va_list);
+NDT_Node  *ND_Tree_Node_Recursive_Find( NDT_Node  *, void  *, va_list);

-NDT_Node * ND_Tree_Parent_Next_Recursive_Get (NDT_Node * Node);
+NDT_Node  *ND_Tree_Parent_Next_Recursive_Get( NDT_Node  *);

-NDT_Node * ND_Tree_Parent_Previous_Recursive_Get (NDT_Node * Node);
+NDT_Node  *ND_Tree_Parent_Previous_Recursive_Get( NDT_Node  *);

-void ND_Tree_Recursive_Print (NDT_Node * Node, long Depth, FILE *);
+void  ND_Tree_Recursive_Print( NDT_Node  *, long, FILE  *);

-void ND_Tree_Link_Recursive_Check (NDT_Node * Node, int *, int *, FILE *);
+void  ND_Tree_Link_Recursive_Check( NDT_Node  *, int  *, int  *, FILE  *);

-void * ND_Symbol_Find (const char *);
+NDT_Status  ND_Symbol_Find( void  **, const char  *);

-void ND_Error_Print (void);
+void  ND_Error_Print( void);

-void ND_Signal_Trap (int);
+void  ND_Signal_Trap( int);

-NDT_Status ND_Address_Check (void * Address);
+NDT_Status  ND_Address_Check( void  *);
--- a/libnode.spec
+++ b/libnode.spec
@@ -0,0 +1,76 @@
+Name:              libnode
+Version:           2.1.0
+
+%define release_nb 1
+
+Release:           %{release_nb}rx3
+
+
+
+%define libnode_name  %{name}-%{version}-%{release_nb}
+%define source        %{libnode_name}.src.tgz
+
+
+
+Summary:      Manages generic list and/or tree node structures
+Copyright:    GPL/LGPL
+Group:        Application/Utilitaires
+Distribution: Rx3 OpenSource
+Vendor:       Rx3
+Packager:     Arnaud G. Gibert <arnaud@rx3.net>
+
+Source:       ftp://ftp.rx3.org/pub/%{source}
+Url:          http://www.rx3.org/dvp/libnode/download/
+BuildRoot:    %{_tmppath}/%{libnode_name}-buildroot
+AutoReqProv:  no
+
+
+
+%description
+Manages generic list and/or tree node structures.
+
+
+
+%files
+/usr
+
+
+
+%build
+rm -rf %{libnode_name}
+tar -xzvvf /usr/src/RPM/SOURCES/%{source}
+cd %{libnode_name}
+make clean
+make all
+
+
+
+%install
+cd %{libnode_name}
+make install ROOT=$RPM_BUILD_ROOT
+
+
+
+%clean
+rm -rf %{libnode_name}
+rm -rf $RPM_BUILD_ROOT
+
+
+
+%changelog
+* Mon Jan 24 2005 Arnaud G. Gibert <arnaud@rx3.net> 2.1.0-1rx3
+- Update to 2.1.0 release,
+- Now use "rx3" as release suffix,
+- Fix copyright entry.
+
+* Wed Jan 19 2005 Arnaud G. Gibert <arnaud@rx3.net> 2.0.7-1
+- Update to 2.0.7 release.
+
+* Tue Aug 24 2004 Arnaud G. Gibert <arnaud@rx3.net> 2.0.6-1
+- Update to 2.0.6 release.
+
+* Tue Jul 15 2003 Arnaud G. Gibert <arnaud@rx3.net> - 2.0.5-1
+- Add release in libnode dir name support.
+
+* Tue Jul 15 2003 Marc Regimbeau <marc.regimbeau@flomaco.net> - 2.0.4-2
+- Initial release of this spec file.
--- a/util/Makefile
+++ b/util/Makefile
@@ -1,17 +1,54 @@
+SRC := ndbench.c
+TARGETS  := ndbench ndbench-c ndbench-static ndbench-static-c
+FILE_BIN := ndbench ndbench-c ndbench-static ndbench-static-c
+FILE_LIB := *.ndb
+FILE_DOC := ndbench.xls
+
+
+
+include ../Makefile.var
+include ../Makefile.rule
+
+
+
+DEP_STATIC  += ../lib/libnode.a
+DEP_DYNAMIC += ../lib/libnode.so
+INCLUDE     += -I . -I ../include
+LIBDIR      += -L . -L ../lib
+LIB_STATIC  += ../lib/libnode.a -ldl
+LIB_DYNAMIC += -lnode -ldl
+CFLAGS      += -rdynamic
+
 ifdef _LIBVER_SUPPORT
-	DEP_VER_STATIC  = ../../libver/ver.h ../../libver/libver.a
-	DEP_VER_DYNAMIC = ../../libver/ver.h ../../libver/libver.so
-	LIB_VER_STATIC  = -I ../../libver ../../libver/libver.a
-	LIB_VER_DYNAMIC = -I ../../libver -L ../../libver -lver
+	DEP_STATIC  += ../../libver/ver.h ../../libver/libver.a
+	DEP_DYNAMIC += ../../libver/ver.h ../../libver/libver.so
+	INCLUDE     += -I ../../libver/lib
+	LIBDIR      += -L ../../libver/lib
+
+        ifeq ($(OSTYPE),linux-gnu)
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
+        else
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
+        endif
+
+        CFLAGS              += -D_LIBVER_SUPPORT
 endif

-all: ndbench ndbench-static
+ND_CHECK_FLAGS   = -DND_MODE=0
+ND_NOCHECK_FLAGS = -DND_MODE=1

-ndbench-static: ndbench.c $(DEP_VER_STATIC) ../lib/node.h ../lib/libnode.a Makefile
-	gcc -g -o ndbench-static -I ../lib ndbench.c -ldl $(LIB_VER_STATIC) ../lib/libnode.a

-ndbench: ndbench.c $(DEP_VER_DYNAMIC) ../lib/node.h ../lib/libnode.so Makefile
-	gcc -g -o ndbench -ldl $(LIB_VER_DYNAMIC) -I ../lib -L ../lib -lnode ndbench.c

-clean:
-	rm -f ndbench ndbench-static
+ndbench: ndbench.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS)  $(ND_NOCHECK_FLAGS) $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+ndbench-c: ndbench.c $(DEP_DYNAMIC)
+	$(CC) -o $@ $(CFLAGS)  $(ND_CHECK_FLAGS)   $(INCLUDE) $(LIBDIR) $(LIB_DYNAMIC) $<
+
+ndbench-static: ndbench.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS)  $(ND_NOCHECK_FLAGS) $(INCLUDE) $< $(LIB_STATIC)
+
+ndbench-static-c: ndbench.c $(DEP_STATIC)
+	$(CC) -o $@ $(CFLAGS)  $(ND_CHECK_FLAGS)   $(INCLUDE) $< $(LIB_STATIC)
--- a/util/ndbench.c
+++ b/util/ndbench.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: ndbench.c,v $                                                         */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.3 $                                                                                                                           */
+/* $Revision: 2.9 $                                                                */
 /* $Name:  $                                                        */
-/* $Date: 2002/02/28 22:00:00 $                                                                                                           */
+/* $Date: 2005/01/20 00:07:27 $                                                    */
 /* $Author: agibert $                                                              */
 /*---------------------------------------------------------------------------------*/

@@ -21,7 +21,7 @@
 /*    GNU Lesser General Public License for more details.                          */
 /*                                                                                 */
 /*    You should have received a copy of the GNU General Public License            */
-/*    along with Foobar; if not, write to the Free Software                        */
+/*    along with LibNode; if not, write to the Free Software                       */
 /*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA    */
 /*---------------------------------------------------------------------------------*/

@@ -41,19 +41,13 @@


 #ifdef _WIN32 
-
 #   include <sys/timeb.h>
-
 #else
-
 #   include <sys/time.h>
-
 #endif

 #ifdef _LIBVER_SUPPORT
-
 #   include <ver.h>
-
 #endif


@@ -64,43 +58,47 @@
 /* Defines                                                                         */
 /*---------------------------------------------------------------------------------*/

-#ifdef _LIBVER
-VER_INFO_EXPORT( ndbench, "$Revision: 2.3 $", "$Name:  $", __FILE__, "$Author: agibert $")
+#ifdef _LIBVER_SUPPORT
+VER_INFO_EXPORT( ndbench, "$Revision: 2.9 $", "$Name:  $", __FILE__, "$Author: agibert $");
+#   define USAGE "Usage : %s [ --help | --version [-v] | --batch_run <batch_file_name>]\n"
+#else
+#   define USAGE "Usage : %s [ --help | --batch_run <batch_file_name>]\n"
 #endif

-#define ND_MODE 1
 #include <node.h>



-#define USAGE "Usage : %s [ --help | --version [-v] | --batch_run <batch_file_name>]\n"
-
 #define QUIT                     0
-#define DS_OPEN                  1
-#define DS_CLOSE                 2
-#define DS_FLUSH                 3
-#define DS_CHECK                 4
-#define DS_REORG                 5
-#define DS_INFO_PRINT            6
-#define DS_VALUE_ADD             7
-#define DS_VALUE_REMOVE          8
-#define DS_VALUE_PRINT           9
-#define DS_VALUE_FIND           10
-#define INDEX_LIST_OPEN         11
-#define INDEX_TREE_OPEN         12
-#define INDEX_CLOSE             13
-#define INDEX_FLUSH             14
-#define INDEX_CHECK             15
-#define INDEX_LIST_SUBTYPE_SET  16
-#define INDEX_LIST_TO_TREE      17
-#define INDEX_TREE_SUBTYPE_SET  18
-#define INDEX_TREE_TO_LIST      19
-#define INDEX_REORG             20
-#define INDEX_INFO_PRINT        21
-#define INDEX_VALUE_PRINT       22
-#define BATCH_RUN               23
+#define LIB_OPEN                 1
+#define LIB_CLOSE                2
+#define DS_OPEN                  3
+#define DS_CLOSE                 4
+#define DS_FLUSH                 5
+#define DS_CHECK                 6
+#define DS_REORG                 7
+#define DS_INFO_PRINT            8
+#define DS_VALUE_ADD             9
+#define DS_VALUE_REMOVE         10
+#define DS_VALUE_PRINT          11
+#define DS_VALUE_FIND           12
+#define INDEX_LIST_OPEN         13
+#define INDEX_TREE_OPEN         14
+#define INDEX_CLOSE             15
+#define INDEX_FLUSH             16
+#define INDEX_CHECK             17
+#define INDEX_LIST_SUBTYPE_SET  18
+#define INDEX_LIST_TO_TREE      19
+#define INDEX_TREE_SUBTYPE_SET  20
+#define INDEX_TREE_TO_LIST      21
+#define INDEX_REORG             22
+#define INDEX_INFO_PRINT        23
+#define INDEX_VALUE_PRINT       24
+#define INDEX_VALUE_BREAK       25
+#define INDEX_NODE_BREAK        26
+#define BATCH_RUN               27

-#define COMMAND_NB              24
+#define COMMAND_NB              28

 #define INDEX_NB                32

@@ -116,6 +114,11 @@ VER_INFO_EXPORT( ndbench, "$Revision: 2.3 $", "$Name:  $", __FILE__, "$Author: a



+#define BUF_LEN            99
+#define BUF_SIZE           (BUF_LEN + 1)
+
+
+


 /*---------------------------------------------------------------------------------*/
@@ -150,6 +153,7 @@ typedef struct

 #   define t_start(x)   { _ftime( &(x.start));}
 #   define t_stop(x)    { _ftime( &(x.stop)); x.sec = (double)(x.stop.time) - (double)(x.start.time) + ((double)(x.stop.millitm) - (double)(x.start.millitm)) / 1000;}
+#   define seed_get(x)  (int)( (x).start.time)

 #else

@@ -160,8 +164,9 @@ typedef struct
 	struct timeval  stop;
 }  cpt;

-#   define t_start(x)  { gettimeofday( &(x.start), NULL);}
-#   define t_stop(x)   { gettimeofday( &(x.stop), NULL); x.sec = (double)(x.stop.tv_sec) - (double)(x.start.tv_sec) + ((double)(x.stop.tv_usec) - (double)(x.start.tv_usec)) / 1000000;}
+#   define t_start(x)   { gettimeofday( &((x).start), NULL);}
+#   define t_stop(x)    { gettimeofday( &((x).stop), NULL); (x).sec = (double)((x).stop.tv_sec) - (double)((x).start.tv_sec) + ((double)((x).stop.tv_usec) - (double)((x).start.tv_usec)) / 1000000;}
+#   define seed_get(x)  (int)( (x).start.tv_sec)

 #endif

@@ -216,6 +221,8 @@ void  Batch_Run( NDT_Root  **, FILE  *, FILE  *, short);
 Command  Command_Tab[] =
 {
    { QUIT,                   "Quit",                   "Quit",                             ( DS_STATE_OPENED | DS_STATE_CLOSED), ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
+    { LIB_OPEN,               "Lib_Open",               "Open Library",                     ( DS_STATE_OPENED | DS_STATE_CLOSED), ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
+    { LIB_CLOSE,              "Lib_Close",              "Close Library",                    ( DS_STATE_OPENED | DS_STATE_CLOSED), ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { DS_OPEN,                "DS_Open",                "Open DataStructure",               ( DS_STATE_CLOSED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { DS_CLOSE,               "DS_Close",               "Close DataStructure",              ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { DS_FLUSH,               "DS_Flush",               "Flush DataStructure",              ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
@@ -238,6 +245,8 @@ Command  Command_Tab[] =
    { INDEX_REORG,            "Index_Reorg",            "Reorg Index",                      ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { INDEX_INFO_PRINT,       "Index_Info_Print",       "Print Index Informations",         ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { INDEX_VALUE_PRINT,      "Index_Value_Print",      "Print Index Values",               ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
+    { INDEX_VALUE_BREAK,      "Index_Value_Break",      "Break Index Value",                ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
+    { INDEX_NODE_BREAK,       "Index_Node_Break",       "Break Index Node",                 ( DS_STATE_OPENED),                   ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)},
    { BATCH_RUN,              "Batch_Run",              "Run NDBench Bach",                 ( DS_STATE_OPENED | DS_STATE_CLOSED), ( NDD_INDEX_TYPE_LIST | NDD_INDEX_TYPE_TREE)}
 };

@@ -262,7 +271,7 @@ NDT_Status  Module_Manager( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_Nod

            Command_Name = "NDD_CMD_MANAGER_VERSION";

-            *Version_Name_Ptr = "$Revision: 2.3 $   $Name:  $   $Date: 2002/02/28 22:00:00 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.9 $   $Name:  $   $Date: 2005/01/20 00:07:27 $   $Author: agibert $";

            return( NDS_OK);
        }
@@ -487,13 +496,13 @@ NDT_Status  Module_Manager( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_Nod
        default:
        {
            printf( "Module_Manager() called with an undefined command %d\n", Command);
-            return(NDS_ERRAPI);
+            return( NDS_ERRAPI);

        }
    }

    printf( "Module_Manager() called with command %d (%s)\n", Command, Command_Name);
-    return(NDS_OK);
+    return( NDS_OK);
 }


@@ -549,7 +558,7 @@ void  Command_Get( int  *choice, char  **arg1, char  **arg2, FILE  *File_Output,
            fprintf( File_Output, "\nChoice ? ");
        }

-        if( fgets( buf, 99, File_Input) != NULL)
+        if( fgets( buf, BUF_LEN, File_Input) != NULL)
        {
            while( ( buf[ strlen( buf) - 1] == '\r') || ( buf[ strlen( buf) - 1] == '\n') || ( buf[ strlen( buf) - 1] == '\t') || ( buf[ strlen( buf) - 1] == ' '))
            {
@@ -663,7 +672,7 @@ void  Command_Index_Range_Get( FILE  *File_Output, int  *Low, int  *High, char
    if( Arg == NULL)
    {
        fprintf( File_Output, "%s: %s range (?-?) : ", Command_Tab[Choice].Name, Obj_Name);
-        fgets( buf, 99, File_Input);
+        fgets( buf, BUF_LEN, File_Input);

        Arg = buf;
    }
@@ -702,7 +711,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 {
    int             low, high, i, j, nb_removed, Nb_Detected, Nb_Corrected;
    T_Module        Ref_Module, *Module_Ptr;
-    char       buf[100];
+    char            buf[BUF_SIZE];
    NDT_Index_Type  index_subtype;


@@ -715,17 +724,68 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
            break;
        }

+        case LIB_OPEN:
+        {
+            Command_Exec_Begin_Print( File_Output, Choice);
+
+	    if( Arg1 == NULL)
+	    {
+		fprintf( File_Output, "Library_Open: Debug Mode ( 0:OFF | 1:ON) ? ");
+		fgets( buf, BUF_LEN, File_Input);
+
+		Arg1 = buf;
+	    }
+
+	    Choice = atoi( Arg1);
+
+            t_start( t_exec);
+            ND_Library_Open( Choice);
+            t_stop( t_exec);
+
+            Command_Exec_End_Print( File_Output, Choice, t_exec, 1);
+            break;
+        }
+
+        case LIB_CLOSE:
+        {
+            Command_Exec_Begin_Print( File_Output, Choice);
+
+            t_start( t_exec);
+            ND_Library_Close();
+            t_stop( t_exec);
+
+            Command_Exec_End_Print( File_Output, Choice, t_exec, 1);
+            break;
+        }
+
        case DS_OPEN:
        {
            Command_Exec_Begin_Print( File_Output, Choice);

+	    if( Arg1 == NULL)
+	    {
+		fprintf( File_Output, "DataStruct_Open: Symbol Lookup ( 0:OFF | 1:ON) ? ");
+		fgets( buf, BUF_LEN, File_Input);
+
+		Arg1 = buf;
+	    }
+
+	    Choice = atoi( Arg1);
+
            for( i = 0; i < INDEX_NB; i++)
            {
                idx_type_tab[i] = NDD_INDEX_STATUS_CLOSED;
            }

            t_start( t_exec);
+	    if( Choice == 0)
+	    {
 		ND_DataStruct_Open( DS_Ptr_Ptr, INDEX_NB, idx_type_tab, "Module_Manager", Module_Manager, NULL, NULL, NULL, NULL, NDD_TRUE, NULL);
+	    }
+	    else
+	    {
+		ND_DataStruct_Open( DS_Ptr_Ptr, INDEX_NB, idx_type_tab, "Module_Manager",           NULL, NULL, NULL, NULL, NULL, NDD_TRUE, NULL);
+	    }
            t_stop( t_exec);

            Command_Exec_End_Print( File_Output, Choice, t_exec, 1);
@@ -805,7 +865,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 		if( Arg2 == NULL)
 		{
 		    fprintf( File_Output, "DS_Value_Add: Add order ( 0:croissant | 1:decroissant) ? ");
-				    fgets( buf, 99 ,stdin);
+		    fgets( buf, BUF_LEN ,stdin);

 		    Arg2 = buf;
 		}
@@ -879,7 +939,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 		if( Arg2 == NULL)
 		{
 		    fprintf( File_Output, "\nDS_Value_Remove: Remove order (croissant=0 | decroissant=1) ? ");
-					fgets( buf, 99, File_Input);
+		    fgets( buf, BUF_LEN, File_Input);

 		    Arg2 = buf;
 		}
@@ -964,7 +1024,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha

 		while( i < j)
 		{
-					Ref_Module.Id = low +( rand( ) % ( high - low));
+		    Ref_Module.Id = low + (int)( (double)( high - low) * rand() / ( RAND_MAX + 1.0));
 		    ND_DataStruct_Value_Find( (void *)&Module_Ptr, *DS_Ptr_Ptr, &Ref_Module);
 		    i++;
 		}
@@ -1053,6 +1113,9 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha

        case INDEX_LIST_SUBTYPE_SET:
        {
+	    int subtype;
+
+
            Command_Index_Range_Get( File_Output, &low, &high, Arg1, File_Input, Choice, "Index");

            if( low != -1)
@@ -1060,14 +1123,14 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
                if( Arg2 == NULL)
 		{
 		    fprintf( File_Output, "Index_List_SubType_Set: List SubType ( 0:FIFO | 1:LIFO | 2:Sorted) ? ");
-	                fgets( buf, 99, File_Input);
+		    fgets( buf, BUF_LEN, File_Input);

 		    Arg2 = buf;
 		}

-				Choice = atoi( Arg2);
+		subtype = atoi( Arg2);

-                switch( Choice)
+                switch( subtype)
                {
                    case 0:
                    {
@@ -1090,7 +1153,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
                    default:
                    {
                        index_subtype = NDD_INDEX_SUBTYPE_UNKNOWN;
-                        printf ("Index_List_SubType_Set: Invalid selection (%d) !\n", Choice);
+                        printf ("Index_List_SubType_Set: Invalid selection (%d) !\n", subtype);
                        break;
                    }
                }
@@ -1124,6 +1187,9 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha

        case INDEX_TREE_SUBTYPE_SET:
        {
+	    int subtype;
+
+
            Command_Index_Range_Get( File_Output, &low, &high, Arg1, File_Input, Choice, "Index");

            if( low != -1)
@@ -1131,14 +1197,14 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 		if( Arg2 == NULL)
 		{
 		    fprintf( File_Output, "Index_Tree_SubType_Set: Tree SubType (0:UnBalanced | 1:Balanced) ? ");
-				    fgets( buf, 99, stdin);
+		    fgets( buf, BUF_LEN, stdin);

 		    Arg2 = buf;
 		}

-			    Choice = atoi( Arg2);
+		subtype = atoi( Arg2);

-                switch( Choice)
+                switch( subtype)
                {
                    case 0:
                    {
@@ -1155,7 +1221,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
                    default:
                    {
 			index_subtype = NDD_INDEX_SUBTYPE_UNKNOWN;
-                        printf ("Index_Tree_SubType_Set: Invalid selection (%d)!\n", Choice);
+                        printf ("Index_Tree_SubType_Set: Invalid selection (%d)!\n", subtype);
                        break;
                    }
 		}
@@ -1264,7 +1330,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha

            if( low != -1)
            {
-                fprintf( File_Output, "DS_Info_Print: Printing index from: (%d)   to: (%d)...\n", low, high);
+                fprintf( File_Output, "Index_Info_Print: Printing index from: (%d)   to: (%d)...\n", low, high);
                fflush( File_Output);

                for( i  = low; i <= high; i++)
@@ -1285,6 +1351,88 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
            break;
        }

+        case INDEX_VALUE_BREAK:
+        {
+	    int        position;
+	    NDT_Node  *node_ptr;
+
+
+            Command_Index_Range_Get( File_Output, &low, &high, Arg1, File_Input, Choice, "Index");
+
+            if( low != -1)
+            {
+		if( Arg2 == NULL)
+		{
+		    fprintf( File_Output, "Index_Value_Break: Value position (0:Head | 1:Tail | 2:Random) ? ");
+		    fgets( buf, BUF_LEN, stdin);
+
+		    Arg2 = buf;
+		}
+
+		position = atoi( Arg2);
+
+                fprintf( File_Output, "Index_Value_Break: Breaking %s values from index : (%d)   to: (%d)...\n",
+			 ( position == 0 ) ? "Head" : ( ( position == 1) ? "Tail" : "Random"),
+			 low, high);
+                fflush( File_Output);
+
+                t_start( t_exec);
+
+                fprintf( File_Output, "Index_Value_Break: Breaking value of nodes: ");
+                fflush( File_Output);
+
+                for( i  = low; i <= high; i++)
+      	        {
+		    switch( position)
+		    {
+			case 0:
+			{
+			    node_ptr  =(*DS_Ptr_Ptr)->Index_Tab[i].Head;
+			    break;
+			}
+
+			case 1:
+			{
+			    node_ptr=(*DS_Ptr_Ptr)->Index_Tab[i].Tail;
+			    break;
+			}
+
+			case 2:
+			{
+			    j = (int)( (double)( (*DS_Ptr_Ptr)->Index_Tab[i].Node_Number) * rand() / ( RAND_MAX + 1.0));
+
+			    for( node_ptr = (*DS_Ptr_Ptr)->Index_Tab[i].Head; j > 0; j--)
+			    {
+				node_ptr = node_ptr->Right;
+			    }
+
+			    break;
+			}
+		    }
+
+		    fprintf( File_Output, "0x(%x)", node_ptr);
+		    fflush( File_Output);
+
+		    node_ptr->Value = (void  *)-1;
+                }
+
+                t_stop (t_exec);
+
+		fprintf( File_Output, "\n");
+		fflush( File_Output);
+
+		Command_Exec_End_Print( File_Output, Choice, t_exec, high - low);
+	    }
+
+            break;
+        }
+
+        case INDEX_NODE_BREAK:
+        {
+
+            break;
+        }
+
        case INDEX_CHECK:
        {
            Command_Index_Range_Get( File_Output, &low, &high, Arg1, File_Input, Choice, "Index");
@@ -1320,7 +1468,7 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
            {
                fprintf( File_Output, "Batch_Run: Batch file name ? ");

-                fgets( buf, 99, stdin);
+                fgets( buf, BUF_LEN, stdin);
                buf[ strlen( buf) - 1] = '\0';
                Arg1 = buf;
            }
@@ -1338,6 +1486,8 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
                Batch_Run( DS_Ptr_Ptr, File_Output, file_input, 0);
                fprintf( File_Output, "\n");
                fprintf( File_Output, "Batch_Run: Ending execution (%s)...\n", Arg1);
+
+		fclose( file_input);
            }

            break;
@@ -1392,10 +1542,17 @@ void  Batch_Run( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, FILE  *File_Input,
 /*                                                                                 */
 /*---------------------------------------------------------------------------------*/

-int  main( int  argc, char  ** argv)
+int  main( int  argc, char  **argv)
 {
    NDT_Root  *ds_ptr = NULL;
-    int        Debug = NDD_TRUE;
+
+
+    /* Init Random numbers... */
+
+    t_start( t_exec);
+    t_stop( t_exec);
+    srand( seed_get(t_exec));
+


    /* Args Parsing */
@@ -1407,37 +1564,31 @@ int  main( int  argc, char  ** argv)
            fprintf( stderr, USAGE, argv[0]);
            return( 1);
        }
+#ifdef _LIBVER_SUPPORT
        else if( !strcmp( argv[1], "--version"))
        {
            if( argc >= 3 && !strcmp( argv[2], "-v"))
            {
-#ifdef _LIBVER_SUPPORT
                return( VER_Object_Print( stdout, VERD_VERBOSE));
-#endif
            }
            else
            {
-#ifdef _LIBVER_SUPPORT
 	        return( VER_Object_Print( stdout, VERD_MINIMAL));
+            }
+        }
 #endif
-            }
-        }
        else if( !strcmp( argv[1], "--batch_run"))
        {
            /* Batch Mode */

-            ND_Library_Open( Debug);
-
            Command_Exec( &ds_ptr, stdout, BATCH_RUN, argv[2], NULL, stdin);

-            ND_Library_Close();
-
-            return(0);
+            return( 0);
        }
        else
        {
            fprintf( stderr, USAGE, argv[0]);
-            return(0);
+            return( -1);
        }
    }

@@ -1445,11 +1596,7 @@ int  main( int  argc, char  ** argv)

    /* Interactive Mode */

-    ND_Library_Open( Debug);
-
    Batch_Run( &ds_ptr, stdout, stdin, 1);

-    ND_Library_Close();
-
    return( 0);
 }
--- a/util/test-10-s.ndb
+++ b/util/test-10-s.ndb
@@ -0,0 +1,10 @@
+Lib_Open 0
+DS_Open 1
+Index_List_Open 0-0
+DS_Value_Add 1-10 0
+DS_Value_Find 1-10
+Index_List_To_Tree 0-0
+DS_Value_Find 1-10
+DS_Check
+DS_Close
+Lib_Close
--- a/util/test-10.ndb
+++ b/util/test-10.ndb
@@ -0,0 +1,10 @@
+Lib_Open 0
+DS_Open 0
+Index_List_Open 0-0
+DS_Value_Add 1-10 0
+DS_Value_Find 1-10
+Index_List_To_Tree 0-0
+DS_Value_Find 1-10
+DS_Check
+DS_Close
+Lib_Close
--- a/util/test-100K-s.ndb
+++ b/util/test-100K-s.ndb
@@ -0,0 +1,10 @@
+Lib_Open 0
+DS_Open 1
+Index_List_Open 0-0
+DS_Value_Add 1-100000 0
+DS_Value_Find 49900-50100
+Index_List_To_Tree 0-0
+DS_Value_Find 1-100000
+DS_Check
+DS_Close
+Lib_Close
--- a/util/test-100K.ndb
+++ b/util/test-100K.ndb
@@ -1,4 +1,5 @@
-DS_Open
+Lib_Open 0
+DS_Open 0
 Index_List_Open 0-0
 DS_Value_Add 1-100000 0
 DS_Value_Find 49900-50100
@@ -6,3 +7,4 @@ Index_List_To_Tree 0-0
 DS_Value_Find 1-100000
 DS_Check
 DS_Close
+Lib_Close
--- a/util/test-10K-s.ndb
+++ b/util/test-10K-s.ndb
@@ -0,0 +1,10 @@
+Lib_Open 0
+DS_Open 1
+Index_List_Open 0-0
+DS_Value_Add 1-10000 0
+DS_Value_Find 4000-6000
+Index_List_To_Tree 0-0
+DS_Value_Find 1-10000
+DS_Check
+DS_Close
+Lib_Close
--- a/util/test-10K.ndb
+++ b/util/test-10K.ndb
@@ -1,4 +1,5 @@
-DS_Open
+Lib_Open 0
+DS_Open 0
 Index_List_Open 0-0
 DS_Value_Add 1-10000 0
 DS_Value_Find 4000-6000
@@ -6,3 +7,4 @@ Index_List_To_Tree 0-0
 DS_Value_Find 1-10000
 DS_Check
 DS_Close
+Lib_Close
--- a/util/test-1M-s.ndb
+++ b/util/test-1M-s.ndb
@@ -0,0 +1,10 @@
+Lib_Open 0
+DS_Open 1
+Index_List_Open 0-0
+DS_Value_Add 1-1000000 0
+DS_Value_Find 499990-500010
+Index_List_To_Tree 0-0
+DS_Value_Find 1-1000000
+DS_Check
+DS_Close
+Lib_Close
--- a/util/test-1M.ndb
+++ b/util/test-1M.ndb
@@ -1,4 +1,5 @@
-DS_Open
+Lib_Open 0
+DS_Open 0
 Index_List_Open 0-0
 DS_Value_Add 1-1000000 0
 DS_Value_Find 499990-500010
@@ -6,3 +7,4 @@ Index_List_To_Tree 0-0
 DS_Value_Find 1-1000000
 DS_Check
 DS_Close
+Lib_Close
--- a/util/test-all.ndb
+++ b/util/test-all.ndb
@@ -1,3 +1,9 @@
+Batch_Run test-error.ndb
+Batch_Run test-10.ndb
+Batch_Run test-10-s.ndb
 Batch_Run test-10K.ndb
+Batch_Run test-10K-s.ndb
 Batch_Run test-100K.ndb
+Batch_Run test-100K-s.ndb
 Batch_Run test-1M.ndb
+Batch_Run test-1M-s.ndb
--- a/util/test-error.ndb
+++ b/util/test-error.ndb
@@ -0,0 +1,15 @@
+DS_Open 0
+Lib_Open 0
+DS_Open 0
+Index_List_Open 0-0
+DS_Value_Add 1-10 0
+Lib_Close
+Lib_Open 1
+DS_Open 0
+Index_List_Open 0-0
+DS_Value_Add 1-10 0
+Index_Value_Break 0-0 0
+Index_Value_Break 0-0 1
+Index_Value_Break 0-0 2
+DS_Check
+Lib_Close
Author	SHA1	Message	Date
agibert	6a6ae07870	Fix release suffix problem.	2005-01-24 01:34:01 +00:00
agibert	b477d4b154	LibShMem 2.0.0 and LibDataStr 2.0.0 now supported !	2005-01-24 01:19:50 +00:00
agibert	334f0cbeb1	Update to 2.1.0-1 release, Cleanup and minor fixes.	2005-01-24 01:19:39 +00:00
agibert	676814b6cf	Fix the release date of the 2.1.0 entry.	2005-01-24 00:50:55 +00:00
agibert	f7c1f8bc5f	Add 2.1.0 entry: Symbol lookup support, news allocator/desallocator API and forthcoming news LibShMem support.	2005-01-20 00:26:48 +00:00
agibert	652ab987a4	Add DS_Open arg: symbol lookup support.	2005-01-20 00:07:27 +00:00
agibert	0431691352	Add Batch_Run test-*-s.ndb.	2005-01-20 00:05:52 +00:00
agibert	3ad6e01702	Add new DS_Open arg.	2005-01-20 00:05:05 +00:00
agibert	4bf44a1fff	Initial Release.	2005-01-20 00:04:22 +00:00
agibert	aa69e7e7b1	Rename _MSC_VER #ifdef into _WIN32 #ifdef.	2005-01-20 00:00:25 +00:00
agibert	29f7064ed0	Re-enable Win32 support. Rename _MSCVER #ifdef into _WIN32 #ifdef.	2005-01-19 23:59:41 +00:00
agibert	97d57e391f	Add Makefile.var auto version label detection to 2.0.7-1 entry.	2005-01-19 23:40:40 +00:00
agibert	d1778a5431	Add PROG_VERSION_NAME varible auto filling from CVS TAG.	2005-01-19 23:30:05 +00:00
agibert	416ee6de00	Update release to libnode-2.0.7-1.	2005-01-19 23:02:30 +00:00
agibert	8c1000401d	Reorder priority... Remove need of debuging !	2005-01-19 22:37:44 +00:00
agibert	11f4f585b3	Update to 2.0.7 release.	2005-01-19 22:34:04 +00:00
agibert	0990ad102d	Add Linux 2.6.x and Windows XP.	2005-01-19 22:32:05 +00:00
agibert	da9d517e9a	Add 2.0.7-1 entry: should be the final release of the 2.0 branch and minor bug fixes in ND_*_Info_Print() functions and ND_Library_StdErr_Set alias defines.	2005-01-19 22:29:05 +00:00
agibert	d50da065a6	Minor variable definition fix.	2005-01-19 20:07:51 +00:00
agibert	f8f96b1ec8	Fix CFLAGS definition. Previous prevents to set debug mode...	2005-01-19 16:50:19 +00:00
agibert	b49d497bfb	Add unconditionally -rdynamic and -ldl to CFLAGS.	2005-01-11 21:03:53 +00:00
agibert	80665f9931	Add dynamic symbol support to ND_Allocator_Exec_I(), ND_Desallocator_Exec_I(), ND_Manager_Exec_I() and ND_Manager_Exec_VI() functions, in order to add LibShMem support. Break NDT_Allocator() API !!! Win32 not compatible... 8^( Code Cleanup.	2005-01-11 20:57:04 +00:00
agibert	1d9539466d	Fix ND_Library_StdErr_Set alias defines.	2005-01-11 16:27:13 +00:00
agibert	3ce278d6e5	Fix printf into fprint in ND_*_Info_Print() functions.\n	2005-01-11 16:17:44 +00:00
agibert	3d91078a5c	Add Index_Value_Break andDS_Check commands.	2004-08-24 20:32:47 +00:00
agibert	51482fb475	Add Index_Value_Break and Index_Node_Break commands, Improve random number generation.	2004-08-24 20:31:28 +00:00
agibert	75cfc21e01	Add ndbech random number improvement in 2.0.6-1 entry.	2004-08-24 20:30:23 +00:00
agibert	5aea056299	Update to 2.0.6 release.	2004-08-23 22:53:02 +00:00
agibert	3f6d118ae2	Code cleanup.	2004-08-23 22:48:37 +00:00
agibert	7c96ad706b	Implement signal support for Windows target, Fix NDT_Root header for HP compilation: Index default number goes from 0 to 1.	2004-08-23 22:47:22 +00:00
agibert	c70c4e5aba	Add final updates in libnode (ND_Check for Windows target) and *Break cmd for ndbench.	2004-08-23 22:45:17 +00:00
agibert	7f142acda3	Add re-implementation of address checking in 2.0.6-1 entry. Fix Micot project spelling.	2004-08-02 21:33:53 +00:00
agibert	64baaa1bc5	Re-implement for unix target, address checking in ND_Address_Check: now use sigaction() and siglingjmp() instead of signal(). Minor code clean-up.	2004-08-02 21:26:03 +00:00
agibert	77330558f0	Add 2.0.6-1 entry, Add TIMA project reference in 2.0.0-alpha1 entry, extend -*- separators from 80 to 132 cols.	2004-08-02 00:25:43 +00:00
agibert	4634d49ce9	Fix 2.0.5-1 authorship: add M. Regimbeau !	2004-08-01 23:49:13 +00:00
agibert	6cae72830f	Initial creation.	2004-08-01 23:42:30 +00:00
agibert	61dfd5c682	Add Lib_Open and Lib_Close calls.	2004-08-01 23:41:02 +00:00
agibert	898992430e	Add Lib_Open and Lib_Close commands, Code clean up.	2004-08-01 23:38:52 +00:00
agibert	3c40fadbff	Add ND_Library_Open() and ND_Library_Close() calls, Code clean up.	2004-08-01 23:35:39 +00:00
agibert	126de83bc9	Add a check version of executables: *-c (ND_MODE=1).	2004-08-01 23:34:31 +00:00
agibert	8541d83655	Add OpenStruct tracing support in ND_Library_Open(), ND_Library_Close(), ND_DataStruct_Open() and ND_DataStruct_Close(), Create NDG_Base global structure variable and move all the sparced global variables into it, ND_Library_Open() call is now mandatory, Add library open test in *_C() functions, Code cleaning, Fix code indentation.	2004-08-01 23:18:37 +00:00
agibert	2274de2cf2	Fix GPL Header.	2004-06-17 22:28:30 +00:00
agibert	fa40487565	Fix an index bug in ND_Tree_Node_Recursive_Add() and ND_List_Sort(), Fix GPL Header.	2004-06-17 22:28:04 +00:00
agibert	79b8e412a2	Add Cache Value option entry.	2003-07-27 23:14:10 +00:00
agibert	de448e9237	Add 2.0.5-1 entry.	2003-07-27 23:13:17 +00:00
agibert	f3598b72e5	Add 'make _LIBVER_SUPPORT=1 all' example.	2003-07-27 23:10:55 +00:00
agibert	f2f8facb0e	Fix FILE_DOC and FILE_LIB.	2003-07-16 23:46:14 +00:00
agibert	d299d7ce87	Remove node.h file installation.	2003-07-16 23:39:46 +00:00
agibert	05877292fa	Initial release.	2003-07-16 23:38:10 +00:00
agibert	ee32700240	Exclude CVS directory from distrib generation.	2003-07-16 23:37:37 +00:00
agibert	7c7ecea547	Add include sub directory.	2003-07-16 23:32:06 +00:00
agibert	3b595554f4	Add %{libnode_name} variable.	2003-07-16 23:18:09 +00:00
agibert	352f592518	Rename $(MKD) into $(MKDIR).	2003-07-16 23:17:07 +00:00
agibert	211babbf5b	Remove old comments, Remove unused install chmod.	2003-07-16 22:57:12 +00:00
agibert	adbf463812	Add distrib rule.	2003-07-16 22:55:51 +00:00
agibert	c4617d7c1f	Move "node.h" from lib to include.	2003-07-16 00:20:53 +00:00
agibert	2f56c19c82	move "node.h" into "../include".	2003-07-16 00:19:21 +00:00
agibert	3443aba602	Rename "nddemo0.txt" into "nddemo0.dat".	2003-07-16 00:17:02 +00:00
agibert	655e66ee8b	Rename "demo0." into "nddemo0.".	2003-07-16 00:16:07 +00:00
agibert	6410c70eb1	Rename "demo0." into "nddemo0.", Rename "nddemo0.txt" into "nddemo0.dat".	2003-07-16 00:13:20 +00:00
agibert	69d684f700	Update Makefile to Marc new system.	2003-07-15 23:57:50 +00:00
agibert	a10f0b1cf5	Initial release.	2003-07-15 23:53:15 +00:00
agibert	6ded620c00	Add lib subdir to libver, Change _LIBVER_SUPPORT by LIBVER_SUPPORT.	2003-01-23 00:25:19 +00:00
agibert	0514715693	Add lib subdir to libver, Change _LIBVER_SUPPORT by LIBVER_SUPPORT, Fix unexported local symbols by adding -rdynamic flag in linking.	2003-01-23 00:24:36 +00:00
agibert	c4969560a3	Fix bad VER_INFO_EXPORT module name...	2003-01-23 00:23:08 +00:00
agibert	10a6a983c5	Add lib subdir to libver, Fix unexported local symbols by adding -rdynamic flag in linking.	2003-01-23 00:21:20 +00:00
agibert	78e9d49e45	Improve libver support.	2003-01-17 17:07:41 +00:00
agibert	27c0b3cda7	Minor print-out improvments.	2003-01-17 17:03:33 +00:00
agibert	a0addad286	Fix LibVer support.	2003-01-17 08:06:57 +00:00
agibert	9bb2b42716	Fix libVer support.	2003-01-17 08:04:24 +00:00
agibert	76e61fb382	Add libnode home page URL and arnaud email address.	2002-08-02 12:34:32 +00:00
agibert	ebfe0b2aec	Replace TIMAT_DataStruct by NDT_DataStruct .	2002-08-02 12:30:06 +00:00
agibert	6c7c5cd686	Fix demo0.dsp path.	2002-07-31 13:20:10 +00:00
agibert	490684cdb6	Add 2.0.4-1 entry: Minor corrections in order to pass valgrind test.	2002-07-29 15:04:09 +00:00
agibert	2b81ff3566	Minor fixes...	2002-07-29 15:02:03 +00:00
agibert	5f92190c59	Add fclose() call at the end of batch_run. ndbench pass valgrind test!	2002-07-29 14:55:57 +00:00
agibert	2260f97db2	Add and use ND_Index_Clear() private function. libnode pass valgrind test!	2002-07-29 14:53:50 +00:00