Add Makefile.var auto version label detection to 2.0.7-1 entry.

Add PROG_VERSION_NAME varible auto filling from CVS TAG.
Update release to libnode-2.0.7-1.
2005-01-19 23:40:40 +00:00 · 2005-01-19 23:30:05 +00:00 · 2005-01-19 23:02:30 +00:00 · 2005-01-19 22:37:44 +00:00 · 2005-01-19 22:34:04 +00:00 · 2005-01-19 22:32:05 +00:00
14 changed files with 776 additions and 460 deletions
--- a/Makefile.var
+++ b/Makefile.var
@@ -1,7 +1,7 @@
 # $RCSfile: Makefile.var,v $
-# $Revision: 1.2 $
+# $Revision: 1.4 $
 # $Name:  $
-# $Date: 2003/07/16 22:55:51 $
+# $Date: 2005/01/19 23:30:05 $
 # $Author: agibert $

 #------------------------------------------------------------------------------
@@ -11,7 +11,13 @@


 PROG_NAME=libnode
-PROG_VERSION_NAME=libnode-2.0.5-1
+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
--- a/ReadMe.txt
+++ b/ReadMe.txt
@@ -1,7 +1,7 @@
 # $RCSfile: ReadMe.txt,v $
-# $Revision: 2.6 $
+# $Revision: 2.7 $
 # $Name:  $
-# $Date: 2003/07/27 23:10:55 $
+# $Date: 2005/01/19 22:32:05 $
 # $Author: agibert $


@@ -13,9 +13,9 @@ Welcome to LibNode 2.0.x !


 This release of LibNode supports the following OS:
-	- Linux 2.2.X and 2.4.x (tested on RedHat & Mandrake),
+	- 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.



--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,16 +1,43 @@
 # $RCSfile: ReleaseNotes.txt,v $
-# $Revision: 2.12 $
+# $Revision: 2.18 $
 # $Name:  $
-# $Date: 2004/08/01 23:49:13 $
+# $Date: 2005/01/19 23:40:40 $
 # $Author: agibert $





--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
+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,
@@ -19,9 +46,9 @@ All:		Add a new Makefile system (Makefile.rule and Makefile.var),



--------------------------------------------------------------------------------
+------------------------------------------------------------------------------------------------------------------------------------
 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,
@@ -29,9 +56,9 @@ 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,
@@ -43,9 +70,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.
@@ -56,9 +83,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,
@@ -70,26 +97,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,
@@ -97,9 +124,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,
@@ -108,18 +135,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,
@@ -127,53 +154,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,15 +1,14 @@
 # $RCSfile: ToDo.txt,v $
-# $Revision: 2.3 $
+# $Revision: 2.4 $
 # $Name:  $
-# $Date: 2003/07/27 23:14:10 $
+# $Date: 2005/01/19 22:37:44 $
 # $Author: agibert $





+- Re-enable LibShM/LibDataStr support (via symbol lookup support),
 - Add Cache Value option,
- More debug !
 - New English documentation (man/tex),
- Improve API consitency,
- Re-enable LibShm/LibDataStr support (via NDT_DataStruct implementation).
+- Improve API consitency.
--- a/demo/Makefile
+++ b/demo/Makefile
@@ -10,12 +10,13 @@ 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
-LIB_DYNAMIC = -lnode
+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
@@ -27,11 +28,11 @@ ifdef _LIBVER_SUPPORT
                LIB_STATIC  += ../../libver/lib/libver.a
                LIB_DYNAMIC += -lver
        else
-                LIB_STATIC  += -ldl ../../libver/lib/libver.a
-                LIB_DYNAMIC += -ldl -lver
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
        endif

-        CFLAGS              += -D_LIBVER_SUPPORT -rdynamic
+        CFLAGS              += -D_LIBVER_SUPPORT
 endif

 ND_CHECK_FLAGS   = -DND_MODE=0
--- a/demo/nddemo0.c
+++ b/demo/nddemo0.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: nddemo0.c,v $                                                         */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.7 $                                                                */
+/* $Revision: 2.8 $                                                                */
 /* $Name:  $                                                                       */
-/* $Date: 2004/08/01 23:35:39 $                                                    */
+/* $Date: 2004/08/23 22:48:37 $                                                    */
 /* $Author: agibert $                                                              */
 /*---------------------------------------------------------------------------------*/

@@ -37,25 +37,25 @@


 #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 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.7 $   $Name:  $   $Date: 2004/08/01 23:35:39 $   $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);
    }
@@ -584,7 +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);
 	}
@@ -607,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)
@@ -634,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)
--- a/include/node.h
+++ b/include/node.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: node.h,v $					       			   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.7 $			      					   */
+/* $Revision: 2.11 $			      					   */
 /* $Name:  $									   */
-/* $Date: 2004/08/01 23:18:37 $							   */
+/* $Date: 2005/01/11 20:57:04 $							   */
 /* $Author: agibert $								   */
 /*---------------------------------------------------------------------------------*/

@@ -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 *);



@@ -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;

@@ -335,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
@@ -385,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
@@ -468,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  *);



@@ -493,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  *);



@@ -503,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  *);



@@ -518,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  *);



@@ -530,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  *);



@@ -554,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, ...);



@@ -567,8 +566,8 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Traverse_C(  NDT_Root  *, NDT_Command  Com
 /* (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);



@@ -578,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  *);



@@ -590,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  *);



@@ -616,10 +615,10 @@ NDD_DLL_API NDT_Status  ND_DataStruct_Value_Print_C(  FILE  *, NDT_Root  *, NDT_
 /* (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  *, ...);



@@ -668,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  *);



@@ -679,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);



@@ -730,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  *);



@@ -742,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  *);



@@ -765,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  *);



@@ -775,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  *);



@@ -893,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  *);



@@ -902,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
@@ -9,8 +9,8 @@ include ../Makefile.rule



-DEP     = libnode.h ../include/node.h Makefile
-INCLUDE = -I . -I ../include
+DEP     += libnode.h ../include/node.h Makefile
+INCLUDE += -I . -I ../include

 ifdef _LIBVER_SUPPORT
 	DEP     += ../../libver/ver.h
--- a/lib/libnode.c
+++ b/lib/libnode.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: libnode.c,v $							   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.10 $								   */
+/* $Revision: 2.14 $								   */
 /* $Name:  $									   */
-/* $Date: 2004/08/01 23:18:38 $							   */
+/* $Date: 2005/01/11 20:57:04 $							   */
 /* $Author: agibert $								   */
 /*---------------------------------------------------------------------------------*/

@@ -34,7 +34,7 @@
 #include <libnode.h>

 #ifdef _LIBVER_SUPPORT
-VER_INFO_EXPORT( libnode, "$Revision: 2.10 $", "$Name:  $", __FILE__, "$Author: agibert $")
+VER_INFO_EXPORT( libnode, "$Revision: 2.14 $", "$Name:  $", __FILE__, "$Author: agibert $")
 #endif


@@ -63,7 +63,7 @@ NDT_Status  ND_Default_Manager( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT

            Command_Name = "NDD_CMD_MANAGER_VERSION";

-            *Version_Name_Ptr = "$Revision: 2.10 $   $Name:  $   $Date: 2004/08/01 23:18:38 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.14 $   $Name:  $   $Date: 2005/01/11 20:57:04 $   $Author: agibert $";

            return( NDS_OK);
 	}
@@ -369,7 +369,7 @@ NDT_Status  ND_OpenStruct_Manager( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id,

            Command_Name = "NDD_CMD_MANAGER_VERSION";

-            *Version_Name_Ptr = "$Revision: 2.10 $   $Name:  $   $Date: 2004/08/01 23:18:38 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.14 $   $Name:  $   $Date: 2005/01/11 20:57:04 $   $Author: agibert $";

            return( NDS_OK);
 	}
@@ -604,6 +604,14 @@ NDT_Status  ND_Library_Open_I( int  Debug_Mode)
        ND_Library_StdErr_Set_I( stderr);
    }

+    if( ( NDG_Base.DL_Ptr = dlopen(  NULL, ( RTLD_NOW | RTLD_GLOBAL))) == NULL)
+    {
+        sprintf( NDG_Base.Err_String, "Error ND_Library_Open: can't dlopen [%s]", dlerror());
+        ND_Error_Print();
+
+        return( NDS_KO);
+    }
+
    return( NDS_OK);
 }

@@ -661,16 +669,23 @@ NDT_Status  ND_Library_Close_I( void)

    Symbol = NDG_Base.Symbol_First_Ptr;

-    while (Symbol)
+    while( Symbol)
    {
 	Next_Symbol = Symbol->Next;
-	free (Symbol->Name);
-	free (Symbol);
+	free( Symbol->Name);
+	free( Symbol);
 	Symbol = Next_Symbol;
    }

    NDG_Base.Symbol_First_Ptr = (NDT_Symbol  *)NULL;

+    if( dlclose( NDG_Base.DL_Ptr) != 0)
+    {
+        sprintf( NDG_Base.Err_String, "Error ND_Library_Open: can't dlclose [%s]", dlerror());
+        ND_Error_Print();
+
+        return( NDS_KO);
+    }

    NDG_Base.Open_Status = NDD_FALSE;

@@ -698,16 +713,16 @@ NDT_Status  ND_Library_Close_C( void)
        return( NDS_KO);
    }

-    if( NDG_Base.Debug_Mode == NDD_TRUE)
+    if( ( NDG_Base.Debug_Mode == NDD_TRUE) && ( NDG_Base.Err_Stream != NULL))
    {
 	if( NDG_Base.OpenStruct_Ptr->Index_Tab[NDD_INDEX_PRIMARY].Node_Number > 0)
 	{
-	    sprintf( NDG_Base.Err_String, "Error ND_Library_Open_C: Unclosed DataStruct:");
+	    sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: Unclosed DataStruct:");
 	    ND_Error_Print();

 	    if( ( status = ND_DataStruct_Info_Print_I( NDG_Base.Err_Stream, NDG_Base.OpenStruct_Ptr, NDD_RECURSIVE_MODE_PARENT_CHILD, 0, 0)) != NDS_OK)
 	    {
-		sprintf( NDG_Base.Err_String, "Error ND_Library_Open_C: can't print OpenStruct info");
+		sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: can't print OpenStruct info");
 		ND_Error_Print();

 		return( NDS_KO);
@@ -716,7 +731,7 @@ NDT_Status  ND_Library_Close_C( void)

 	if( ( status = ND_DataStruct_Close_I( NDG_Base.OpenStruct_Ptr)) != NDS_OK)
 	{
-	    sprintf( NDG_Base.Err_String, "Error ND_Library_Open_C: can't close OpenStruct");
+	    sprintf( NDG_Base.Err_String, "Error ND_Library_Close_C: can't close OpenStruct");
 	    ND_Error_Print();
 	    
 	    return( NDS_KO);
@@ -903,7 +918,6 @@ NDT_Status ND_DataStruct_Open_I( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_N
 				 NDT_Allocator_Name  Allocator_Name, NDT_Allocator  *Allocator_Ptr, NDT_Desallocator_Name  Desallocator_Name, NDT_Desallocator  *Desallocator_Ptr, short  Own_Value, void  *Data)
 {
    NDT_Status		    status;
-//    const char  *Real_Allocator,  *Real_Desallocator; // Win32
    NDT_Manager_Name	    Real_Manager_Name;
    NDT_Manager		   *Real_Manager_Ptr;
    NDT_Allocator_Name	    Real_Allocator_Name;
@@ -914,7 +928,7 @@ NDT_Status ND_DataStruct_Open_I( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_N

    /* Valeurs par défaut des fonctions d'allocation et de désallocation */

-    if( Manager_Ptr)
+    if( ( Manager_Name != NULL) || ( Manager_Ptr != NULL))
    {
        Real_Manager_Name = Manager_Name;
 	Real_Manager_Ptr  = Manager_Ptr;
@@ -925,7 +939,7 @@ NDT_Status ND_DataStruct_Open_I( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_N
 	Real_Manager_Ptr  = ND_Default_Manager;
    }

-    if( Allocator_Ptr)
+    if( ( Allocator_Name != NULL) || ( Allocator_Ptr != NULL))
    {
        Real_Allocator_Name = Allocator_Name;
 	Real_Allocator_Ptr  = Allocator_Ptr;
@@ -936,7 +950,7 @@ NDT_Status ND_DataStruct_Open_I( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_N
 	Real_Allocator_Ptr  = ND_Default_Allocator;
    }

-    if( Desallocator_Ptr)
+    if( ( Desallocator_Name != NULL) || ( Desallocator_Ptr != NULL))
    {
        Real_Desallocator_Name = Desallocator_Name;
 	Real_Desallocator_Ptr  = Desallocator_Ptr;
@@ -2162,7 +2176,7 @@ NDT_Status ND_Index_Info_Print_I( FILE  *Out, NDT_Root  *Root_Ptr, NDT_Index_Id
        memset( offset, ' ', Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET);
 	offset[Recursive_Offset * ND_RECURSIVE_PRINT_OFFSET] = '\0';

-	printf( "%s    Index Id: (%d)\tType: (%#06x) [%s:%s:%s]\tNode Nb: (%d)\tHead: (%s%p)\tTail: (%s%p)\n%s    Min Depth: (%d)\tMax Depth: (%d)\tMax Dif: (%d)\tNb Equ: (%d)\tSave: (%s%p)\n\n",
+	fprintf( Out, "%s    Index Id: (%d)\tType: (%#06x) [%s:%s:%s]\tNode Nb: (%d)\tHead: (%s%p)\tTail: (%s%p)\n%s    Min Depth: (%d)\tMax Depth: (%d)\tMax Dif: (%d)\tNb Equ: (%d)\tSave: (%s%p)\n\n",
 		offset, Index_Id, Root_Ptr->Index_Tab[Index_Id].Type, ND_INDEX_STATUS_ASCII_GET( Root_Ptr, Index_Id), ND_INDEX_TYPE_ASCII_GET( Root_Ptr, Index_Id), ND_INDEX_SUBTYPE_ASCII_GET( Root_Ptr, Index_Id),
 		Root_Ptr->Index_Tab[Index_Id].Node_Number,
 		NDD_PRINTF_PTR_PREFIX, Root_Ptr->Index_Tab[Index_Id].Head, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Index_Tab[Index_Id].Tail,
@@ -2249,9 +2263,9 @@ NDT_Status ND_DataStruct_Info_Print_I( FILE  *Out, NDT_Root  *Root_Ptr, NDT_Recu
 	status = ND_Manager_Exec_I( Root_Ptr, NDD_INDEX_UNKNOWN, NULL, NDD_CMD_MANAGER_VERSION, &version_name);
 	if( ND_ERROR( status)) return( status);

-	printf( "%sRoot: (%s%p)\tIndex Nb: (%d)\tIndex Open Count: (%d)\tManager: (%s%p) [%s]\n%sAllocator: (%s%p) [%s]\tDesallocator: (%s%p) [%s]\tUser: (%s%p)\n%sManager Version: [%s]\n\n",
+	fprintf( Out, "%sRoot: (%s%p)\tIndex Nb: (%d)\tIndex Open Count: (%d)\tManager: (%s%p) [%s]\n%sAllocator: (%s%p) [%s]\tDesallocator: (%s%p) [%s]\tUser: (%s%p)\n%sManager Version: [%s]\n\n",
 		offset, NDD_PRINTF_PTR_PREFIX, Root_Ptr, Root_Ptr->Index_Nb, Root_Ptr->Index_Open_Count, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Manager_Ptr, Root_Ptr->Manager_Name,
-                offset, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Allocator_Ptr, Root_Ptr->Allocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Desallocator_Ptr, Root_Ptr->Desallocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->User,
+                offset, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Allocator_Ptr, Root_Ptr->Allocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->Desallocator_Ptr, Root_Ptr->Desallocator_Name, NDD_PRINTF_PTR_PREFIX, Root_Ptr->User_Ptr,
 		offset, version_name);
    }

@@ -2780,7 +2794,7 @@ NDT_Status  ND_DataStruct_Value_Print_C( FILE  *Out, NDT_Root  *Root_Ptr, NDT_Re
        sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Print_C: structure root is null");
        ND_Error_Print();

-        return(NDS_ERRAPI);
+        return( NDS_ERRAPI);
    }

    if( !Out)
@@ -2788,7 +2802,7 @@ NDT_Status  ND_DataStruct_Value_Print_C( FILE  *Out, NDT_Root  *Root_Ptr, NDT_Re
        sprintf( NDG_Base.Err_String, "Error ND_DataStruct_Value_Print_C: the stream descriptor is null");
        ND_Error_Print();

-        return(NDS_ERRAPI);
+        return( NDS_ERRAPI);
    }

    status =  ND_DataStruct_Value_Print_VI( Out, Root_Ptr, Recursive_Mode, Recursive_Depth, Recursive_Offset, user_args);
@@ -2817,10 +2831,10 @@ NDT_Status  ND_Index_Node_Add_I( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, ND
    {
        sprintf (NDG_Base.Err_String, "Error ND_Index_Node_Add_I: unknown structure type (%d)", Root_Ptr->Index_Tab[Index_Id].Type);
        ND_Error_Print ();
-        return(NDS_ERRAPI);
+        return( NDS_ERRAPI);
    }

-    return(NDS_KO);
+    return( NDS_KO);
 }


@@ -3796,7 +3810,20 @@ NDT_Status  ND_Manager_Exec_VI( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT
    NDT_Manager  *manager_ptr;


-    manager_ptr = Root_Ptr->Manager_Ptr; // Win32
+    if(  Root_Ptr->Manager_Ptr != NULL)
+    {
+	manager_ptr = Root_Ptr->Manager_Ptr;
+    }
+    else
+    {
+	if( ND_Symbol_Find( (void  **)&manager_ptr, Root_Ptr->Manager_Name) != NDS_OK)
+	{
+	    sprintf( NDG_Base.Err_String, "ND_Manager_Exec_VI: cant't find manger function");
+	    ND_Error_Print();
+
+	    return( NDS_KO);
+	}
+    }

    status = manager_ptr( Root_Ptr, Index_Id, Node_Ptr, Command, Args);

@@ -3865,7 +3892,20 @@ NDT_Status  ND_Manager_Exec_I( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_
 	
    va_start( args, Command);

-    manager_ptr = Root_Ptr->Manager_Ptr; // Win32
+    if(  Root_Ptr->Manager_Ptr != NULL)
+    {
+	manager_ptr = Root_Ptr->Manager_Ptr;
+    }
+    else
+    {
+	if( ND_Symbol_Find( (void  **)&manager_ptr, Root_Ptr->Manager_Name) != NDS_OK)
+	{
+	    sprintf( NDG_Base.Err_String, "ND_Manager_Exec_I: cant't find manger function");
+	    ND_Error_Print();
+
+	    return( NDS_KO);
+	}
+    }

    status = manager_ptr( Root_Ptr, Index_Id, Node_Ptr, Command, args);

@@ -3936,15 +3976,27 @@ NDT_Status  ND_Manager_Exec_C( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_
 /* (I) Data     : données utilisateur utiles à l'allocateur                     */
 /*------------------------------------------------------------------------------*/

-NDT_Status  ND_Allocator_Exec_I( NDT_Allocator  *Function, void  **Ptr_Ptr, size_t  Size, void  *Data_Ptr)
+NDT_Status  ND_Allocator_Exec_I( void  **Ptr_Ptr, size_t  Size, NDT_Allocator_Name   Allocator_Name, NDT_Allocator  *Allocator_Ptr, void  *Data_Ptr)
 {
    NDT_Allocator  *allocator_ptr;

-    *Ptr_Ptr = NULL;

-    allocator_ptr = Function;
+    if( Allocator_Ptr != NULL)
+    {
+	allocator_ptr = Allocator_Ptr;
+    }
+    else
+    {
+	if( ND_Symbol_Find( (void  **)&allocator_ptr, Allocator_Name) != NDS_OK)
+	{
+	    sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_I: cant't find allocator function");
+	    ND_Error_Print();

-    return allocator_ptr( Size, Ptr_Ptr, Data_Ptr);
+	    return( NDS_KO);
+	}
+    }
+
+    return allocator_ptr( Ptr_Ptr, Size, Data_Ptr);
 }


@@ -3960,11 +4012,8 @@ NDT_Status  ND_Allocator_Exec_I( NDT_Allocator  *Function, void  **Ptr_Ptr, size
 /* (I) Data     : données utilisateur utiles à l'allocateur                     */
 /*------------------------------------------------------------------------------*/

-NDT_Status  ND_Allocator_Exec_C ( NDT_Allocator  *Function, void  **Ptr_Ptr, size_t  Size, void  *Data_Ptr)
+NDT_Status  ND_Allocator_Exec_C( void  **Ptr_Ptr, size_t  Size, NDT_Allocator_Name   Allocator_Name, NDT_Allocator  *Allocator_Ptr, void  *Data_Ptr)
 {
-    NDT_Allocator  *Allocator_Ptr;
-
-
    if( NDG_Base.Open_Status != NDD_TRUE)
    {
        sprintf( NDG_Base.Err_String, "Error ND_Allocator_Exec_C: library is not open");
@@ -3973,21 +4022,15 @@ NDT_Status  ND_Allocator_Exec_C ( NDT_Allocator  *Function, void  **Ptr_Ptr, siz
        return( NDS_ERRAPI);
    }

-    *Ptr_Ptr = NULL;
-
-    if(!Function || !*Function)
+    if( ( Allocator_Name == NULL) && ( Allocator_Ptr == NULL))
    {
        sprintf( NDG_Base.Err_String, "Error ND_Allocator_Exec_C: undefined function name");
-        ND_Error_Print ();
+        ND_Error_Print();

        return( NDS_ERRAPI);
    }

-    Allocator_Ptr = Function;
-
-    if( !Allocator_Ptr) return( NDS_ERRAPI);
-
-    return( Allocator_Ptr (Size, Ptr_Ptr, Data_Ptr));
+    return( ND_Allocator_Exec_I( Ptr_Ptr, Size, Allocator_Name, Allocator_Ptr, Data_Ptr));
 }


@@ -4002,11 +4045,25 @@ NDT_Status  ND_Allocator_Exec_C ( NDT_Allocator  *Function, void  **Ptr_Ptr, siz
 /* (I) Data     : données utilisateur utiles à l'allocateur                     */
 /*------------------------------------------------------------------------------*/

-NDT_Status ND_Desallocator_Exec_I( NDT_Desallocator  *Function, void  *Ptr, void  *Data_Ptr)
+NDT_Status ND_Desallocator_Exec_I( void  *Ptr, NDT_Desallocator_Name  Desallocator_Name, NDT_Desallocator  *Desallocator_Ptr, void  *Data_Ptr)
 {
    NDT_Desallocator  *desallocator_ptr;

-    desallocator_ptr = Function;
+
+    if( Desallocator_Ptr != NULL)
+    {
+	desallocator_ptr = Desallocator_Ptr;
+    }
+    else
+    {
+	if( ND_Symbol_Find( (void  **)&desallocator_ptr, Desallocator_Name) != NDS_OK)
+	{
+	    sprintf( NDG_Base.Err_String, "Error ND_Manager_Exec_I: cant't find desallocator function");
+	    ND_Error_Print();
+
+	    return( NDS_KO);
+	}
+    }

    return( desallocator_ptr( Ptr, Data_Ptr));
 }
@@ -4023,11 +4080,8 @@ NDT_Status ND_Desallocator_Exec_I( NDT_Desallocator  *Function, void  *Ptr, void
 /* (I) Data     : données utilisateur utiles à l'allocateur                     */
 /*------------------------------------------------------------------------------*/

-NDT_Status  ND_Desallocator_Exec_C( NDT_Desallocator  *Function, void  *Ptr, void  *Data_Ptr)
+NDT_Status ND_Desallocator_Exec_C( void  *Ptr, NDT_Desallocator_Name  Desallocator_Name, NDT_Desallocator  *Desallocator_Ptr, void  *Data_Ptr)
 {
-    NDT_Desallocator  *desallocator_ptr;
-
-
    if( NDG_Base.Open_Status != NDD_TRUE)
    {
        sprintf( NDG_Base.Err_String, "Error ND_Desallocator_Exec_C: library is not open");
@@ -4036,19 +4090,15 @@ NDT_Status  ND_Desallocator_Exec_C( NDT_Desallocator  *Function, void  *Ptr, voi
        return( NDS_ERRAPI);
    }

-    if (!Function || !*Function)
+    if( ( Desallocator_Name == NULL) && ( Desallocator_Ptr == NULL))
    {
-        sprintf (NDG_Base.Err_String, "Error ND_Desallocator_Exec_C: undefined function name");
-        ND_Error_Print ();
+        sprintf( NDG_Base.Err_String, "Error ND_Desallocator_Exec_C: undefined function name");
+        ND_Error_Print();

        return( NDS_ERRAPI);
    }

-    desallocator_ptr = Function;
-
-    if( !desallocator_ptr) return( NDS_ERRAPI);
-
-    return( desallocator_ptr( Ptr, Data_Ptr));
+    return( ND_Desallocator_Exec_I( Ptr, Desallocator_Name, Desallocator_Ptr, Data_Ptr));
 }


@@ -4058,25 +4108,19 @@ NDT_Status  ND_Desallocator_Exec_C( NDT_Desallocator  *Function, void  *Ptr, voi


 /*------------------------------------------------------------------------------*/
-/*                      FONCTIONS SECURISEES (ND_MODE = 0)                      */
 /*------------------------------------------------------------------------------*/
-
-
-
-
-/*------------------------------------------------------------------------------*/
-/*------------------------------------------------------------------------------*/
-/*                              FONCTIONS PRIVEES                               */
+/*                              PRIVATE FUNCTIONS                               */
 /*------------------------------------------------------------------------------*/
 /*------------------------------------------------------------------------------*/

 /*------------------------------------------------------------------------------*/
-/* Recherche d'un symbole                                                       */
+/* Symbol Lookup                                                                */
 /*------------------------------------------------------------------------------*/
-void  *ND_Symbol_Find( const char  *Symbol_Name)
+
+NDT_Status  ND_Symbol_Find( void  **Ptr_Ptr, const char  *Symbol_Name)
 {
    NDT_Symbol  *Symbol_Ptr;
-    void        *Ptr = NULL;
+

    /* Recherche du symbole dans la table des symboles locale */

@@ -4084,31 +4128,46 @@ void  *ND_Symbol_Find( const char  *Symbol_Name)

    while( Symbol_Ptr)
    {
-        if( !strcmp( Symbol_Ptr->Name, Symbol_Name)) return( Symbol_Ptr->Ptr);
-        else Symbol_Ptr = Symbol_Ptr->Next;
+        if( !strcmp( Symbol_Ptr->Name, Symbol_Name))
+	{
+	    *Ptr_Ptr = Symbol_Ptr->Ptr;
+	    return( NDS_OK);
 	}
+        else 
+	{
+	    Symbol_Ptr = Symbol_Ptr->Next;
+	}
+    }
+

    /* Si le symbole n'a pas été trouvée dans la table des symboles locale, on l'y ajoute */

-//    Ptr = dlsym( RTLD_DEFAULT, (const char  *)Symbol_Name);
-    if( !Ptr)
+    if( ( *Ptr_Ptr = dlsym( NDG_Base.DL_Ptr, (const char  *)Symbol_Name)) == NULL)
    {
-        sprintf( NDG_Base.Err_String, "Error ND_Symbol_Find: unable to find \"%s\"' in symbol table (%s)", Symbol_Name, NULL/*dlerror ()*/);
-        ND_Error_Print ();
-        return NULL;
+        sprintf( NDG_Base.Err_String, "Error ND_Symbol_Find: unable to find \"%s\"' in symbol table (%s)", Symbol_Name, dlerror());
+        ND_Error_Print();
+
+        return( NDS_KO);
    }

    Symbol_Ptr = (NDT_Symbol  *)malloc( sizeof( NDT_Symbol));
-    if( Symbol_Ptr)
+    if( Symbol_Ptr == NULL)
+    {
+        sprintf( NDG_Base.Err_String, "Error ND_Symbol_Find: no more memory");
+        ND_Error_Print();
+
+        return( NDS_KO);
+    }
+    else
    {
        Symbol_Ptr->Name = strdup (Symbol_Name);
-        Symbol_Ptr->Ptr = Ptr;
+        Symbol_Ptr->Ptr  = *Ptr_Ptr;
        Symbol_Ptr->Next = NDG_Base.Symbol_First_Ptr;

 	NDG_Base.Symbol_First_Ptr = Symbol_Ptr;
    }

-    return Ptr;
+    return( NDS_OK);
 }


@@ -4127,8 +4186,8 @@ NDT_Status  ND_Node_Alloc( NDT_Root  *Root_Ptr, NDT_Node  **Node_Ptr_Ptr )
    NDT_Status  rc;


-    rc = ND_Allocator_Exec_I( Root_Ptr->Allocator_Ptr, (void **)Node_Ptr_Ptr, sizeof(NDT_Node), Root_Ptr->User);
-    if( ND_ERROR(rc)) return(rc);
+    rc = ND_Allocator_Exec_I( (void  **)Node_Ptr_Ptr, sizeof(NDT_Node), Root_Ptr->Allocator_Name, Root_Ptr->Allocator_Ptr, Root_Ptr->User_Ptr);
+    if( ND_ERROR( rc)) return( rc);

    (*Node_Ptr_Ptr)->Root   = NULL;
    (*Node_Ptr_Ptr)->Index  = NDD_INDEX_UNKNOWN;
@@ -4137,7 +4196,7 @@ NDT_Status  ND_Node_Alloc( NDT_Root  *Root_Ptr, NDT_Node  **Node_Ptr_Ptr )
    (*Node_Ptr_Ptr)->Right  = NULL;
    (*Node_Ptr_Ptr)->Value  = NULL;

-    return(NDS_OK);
+    return( NDS_OK);
 }


@@ -4152,7 +4211,7 @@ NDT_Status  ND_Node_Alloc( NDT_Root  *Root_Ptr, NDT_Node  **Node_Ptr_Ptr )
 /*------------------------------------------------------------------------------*/
 NDT_Status ND_Node_Free( NDT_Root  *Root_Ptr, NDT_Node  *Node_Ptr)
 {
-    return ND_Desallocator_Exec_I( Root_Ptr->Desallocator_Ptr, Node_Ptr, Root_Ptr->User);
+    return( ND_Desallocator_Exec_I( Node_Ptr, Root_Ptr->Desallocator_Name, Root_Ptr->Desallocator_Ptr, Root_Ptr->User_Ptr));
 }


@@ -4208,7 +4267,7 @@ NDT_Status ND_Node_Root_Alloc( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_Nb,
    NDT_Index_Id  index_id;


-    status = ND_Allocator_Exec_I( Allocator_Ptr, (void **)Root_Ptr_Ptr, ( sizeof (NDT_Root) + sizeof(NDT_Index) * (Index_Nb + 1)), Data_Ptr);
+    status = ND_Allocator_Exec_I( (void **)Root_Ptr_Ptr, ( sizeof( NDT_Root) + sizeof(NDT_Index) * (Index_Nb - 1)), Allocator_Name, Allocator_Ptr, Data_Ptr);
    if( ND_ERROR(status)) return( status);

    if( strlen(Manager_Name) > NDD_MANAGER_NAME_LEN_MAX) return( NDS_ERRAPI);
@@ -4224,7 +4283,7 @@ NDT_Status ND_Node_Root_Alloc( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_Nb,
    (*Root_Ptr_Ptr)->Desallocator_Ptr = Desallocator_Ptr;

    (*Root_Ptr_Ptr)->Own_Value        = Own_Value;
-    (*Root_Ptr_Ptr)->User = Data_Ptr;
+    (*Root_Ptr_Ptr)->User_Ptr         = Data_Ptr;

    (*Root_Ptr_Ptr)->Index_Nb         = Index_Nb;
    (*Root_Ptr_Ptr)->Index_Open_Count = 0;
@@ -4245,11 +4304,11 @@ NDT_Status ND_Node_Root_Alloc( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_Nb,
 		return( NDS_KO);
 	    }

-	    (*Root_Ptr_Ptr)->Index_Tab[index_id].Type = NDD_INDEX_STATUS_CLOSED;
+	    ( *Root_Ptr_Ptr)->Index_Tab[index_id].Type = NDD_INDEX_STATUS_CLOSED;
 	}
    }

-    return(NDS_OK);
+    return( NDS_OK);
 }


@@ -4263,7 +4322,7 @@ NDT_Status ND_Node_Root_Alloc( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_Nb,
 /*------------------------------------------------------------------------------*/
 NDT_Status ND_Node_Root_Free( NDT_Root  *Root_Ptr)
 {
-    return ND_Desallocator_Exec_I( Root_Ptr->Desallocator_Ptr, Root_Ptr, Root_Ptr->User);
+    return( ND_Desallocator_Exec_I( Root_Ptr, Root_Ptr->Desallocator_Name, Root_Ptr->Desallocator_Ptr, Root_Ptr->User_Ptr));
 }


@@ -4329,7 +4388,7 @@ NDT_Status  ND_List_Node_Add( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, NDT_N

            if(!New_Node_Ptr->Left && !New_Node_Ptr->Right)
            {
-                if (!Root_Ptr->Index_Tab[Index_Id].Tail) Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr;
+                if( !Root_Ptr->Index_Tab[Index_Id].Tail) Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = New_Node_Ptr;
                else
                {
                    Root_Ptr->Index_Tab[Index_Id].Tail->Right = New_Node_Ptr;
@@ -4449,7 +4508,7 @@ NDT_Status  ND_List_Value_Add( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, void

    node_ptr->Value = Value_Ptr;

-//    return ND_List_Node_Add (Root, Node);
+//    return ND_List_Node_Add( Root, Node);

    rc = ND_List_Node_Add( Root_Ptr, Index_Id, node_ptr);
    if( ND_ERROR(rc))
@@ -4484,7 +4543,7 @@ NDT_Status  ND_Tree_Value_Add( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, void

    node_ptr->Value = Value_Ptr;

-//    return ND_Tree_Node_Add (Root, Node);
+//    return ND_Tree_Node_Add( Root, Node);

    rc = ND_Tree_Node_Add( Root_Ptr, Index_Id, node_ptr);
    if( ND_ERROR(rc))
@@ -4525,7 +4584,7 @@ NDT_Node  *ND_List_Node_Find( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, void
        {
            rc = ND_Manager_Exec_I( Root_Ptr, Index_Id, node_ptr, NDD_CMD_VALUE_COMP, Value_Ptr, node_ptr->Value, User_Args);

-            switch (rc)
+            switch( rc)
            {
                case NDS_EQUAL:
 		{
@@ -4702,10 +4761,12 @@ NDT_Status  ND_List_Recursive_Make( NDT_Node  *Node_Ptr, NDT_Root  *Root_Ptr, ND


 /*--------------------------------- main body --------------------------------*/
+
 NDT_Status  ND_List_Make( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id)
 {
    NDT_Node  *node_ptr;

+
    node_ptr = Root_Ptr->Index_Tab[Index_Id].Head;

    Root_Ptr->Index_Tab[Index_Id].Head        = NULL;
@@ -4739,7 +4800,7 @@ NDT_Node  *ND_Tree_Recursive_Make( long  Depth, long  Node_Number, NDT_Node  *No
    NDT_Node  *left_node_ptr, *middle_node_ptr, *right_node_ptr;


-    if( !Node_Ptr) return (NULL);
+    if( !Node_Ptr) return( NULL);

    /* On calcule le milieu de la liste */

@@ -4823,7 +4884,7 @@ NDT_Status  ND_Tree_Make( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id )
    if( ND_INDEX_SUBTYPE_SORTED_IS( Root_Ptr, Index_Id))
    {
        rc = ND_List_Sort( Root_Ptr, Index_Id);
-        if( ND_ERROR(rc)) return rc;
+        if( ND_ERROR(rc)) return( rc);
    }

    node_ptr = Root_Ptr->Index_Tab[Index_Id].Head;
@@ -4840,7 +4901,7 @@ NDT_Status  ND_Tree_Make( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id )

    Root_Ptr->Index_Tab[Index_Id].Head = Root_Ptr->Index_Tab[Index_Id].Tail = ND_Tree_Recursive_Make( 1, node_number, node_ptr);

-    return NDS_OK;
+    return( NDS_OK);
 }


@@ -4857,14 +4918,10 @@ NDT_Status  ND_Tree_Equalize( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id)
 {
    NDT_Status       rc;
    NDT_Index_Type   type;
-//    char            manager[30]; // Win32
-    void			*manager; // Win32
    long             max_dif, nb_equ;


    type    = Root_Ptr->Index_Tab[Index_Id].Type;
-//    strcpy( Manager, Root_Ptr->Manager); // Win32
-    manager = Root_Ptr->Manager_Ptr; // Win32
    max_dif = Root_Ptr->Index_Tab[Index_Id].Max_Dif;
    nb_equ  = Root_Ptr->Index_Tab[Index_Id].Nb_Equ;

@@ -4877,8 +4934,6 @@ NDT_Status  ND_Tree_Equalize( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id)
    if( ND_ERROR(rc)) return(rc);

    Root_Ptr->Index_Tab[Index_Id].Type    = type;
-//    strcpy( Root_Ptr->Manager, Manager); // Win32
-    Root_Ptr->Manager_Ptr = manager; // Win32
    Root_Ptr->Index_Tab[Index_Id].Max_Dif = max_dif;
    Root_Ptr->Index_Tab[Index_Id].Nb_Equ  = nb_equ + 1;

@@ -4900,7 +4955,7 @@ long  ND_Tree_MaxDepth_Get( NDT_Node  *Node_Ptr)
    long  Max_Left, Max_Right;


-    if( !Node_Ptr) return ( 0);
+    if( !Node_Ptr) return( 0);

    Max_Left = ND_Tree_MaxDepth_Get( Node_Ptr->Left);

@@ -4975,7 +5030,7 @@ void  ND_Tree_Node_Recursive_Add( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id, N

        if( Max_Depth + Depth - 1 > Root_Ptr->Index_Tab[Index_Id].Max_Depth) Root_Ptr->Index_Tab[Index_Id].Max_Depth = Max_Depth + Depth - 1;

-        if (Min_Depth + Depth - 1 < Root_Ptr->Index_Tab[Index_Id].Min_Depth) Root_Ptr->Index_Tab[Index_Id].Min_Depth = Min_Depth +  Depth - 1 ;
+        if( Min_Depth + Depth - 1 < Root_Ptr->Index_Tab[Index_Id].Min_Depth) Root_Ptr->Index_Tab[Index_Id].Min_Depth = Min_Depth +  Depth - 1 ;
    }
 }

@@ -5015,7 +5070,7 @@ NDT_Status  ND_Tree_List_Add( NDT_Root  *Tree_Root_Ptr, NDT_Index_Id  Tree_Index
    while( node_ptr)
    {
        rc = ND_Tree_Node_Add( Tree_Root_Ptr, Tree_Index_Id, node_ptr);
-        if( ND_ERROR(rc)) return(rc);
+        if( ND_ERROR( rc)) return( rc);
        node_ptr = node_ptr->Right;
    }

@@ -5051,14 +5106,14 @@ void  ND_Tree_Recursive_Print( NDT_Node  *Node_Ptr, long  Depth, FILE  *Out)

 /*  Affichage des toutes les informations (noeud et valeur) :

-if (Node->Root) fprintf (Out, "Root=%p ", Node->Root);
-if (Node->Parent) fprintf (Out, "Parent=%p ", Node->Parent);
-if (Node->Left) fprintf (Out, "Left=%p ", Node->Left);
-if (Node->Right) fprintf (Out, "Right=%p ", Node->Right);
+if( Node->Root) fprintf( Out, "Root=%p ", Node->Root);
+if( Node->Parent) fprintf( Out, "Parent=%p ", Node->Parent);
+if( Node->Left) fprintf( Out, "Left=%p ", Node->Left);
+if( Node->Right) fprintf( Out, "Right=%p ", Node->Right);

-fprintf (Out, "Value=[");
-ND_Manager_Exec (Node->Root->Manager, NDD_CMD_PRINT_VALUE, Node->Value, Out);
-fprintf (Out, "]\n");
+fprintf( Out, "Value=[");
+ND_Manager_Exec( Node->Root->Manager, NDD_CMD_PRINT_VALUE, Node->Value, Out);
+fprintf( Out, "]\n");
 */

 /*  Affichage de la valeur seule : */
@@ -5068,7 +5123,7 @@ fprintf (Out, "]\n");

    if( Node_Ptr->Left)
    {
-        fprintf( Out, "%*s\\\n", (int)(Depth * BRANCH_LEN - 1), "");
+        fprintf( Out, "%*s\\\n", (int)( Depth * BRANCH_LEN - 1), "");
        ND_Tree_Recursive_Print( Node_Ptr->Left, Depth + 1, Out);
    }
 }
@@ -5086,19 +5141,21 @@ int ND_Node_Compare( void  **Node1_Ptr_Ptr, void  **Node2_Ptr_Ptr)
    NDT_Status rc;


-//    rc = ND_Manager_Exec_I( Tmp_Root->Manager, NDD_CMD_COMP_VALUE_COMP, ((NDT_Node *)(*Node1))->Value, ((NDT_Node *)(*Node2))->Value);
-    rc = ND_Manager_Exec_I( ((NDT_Node *)(*Node1_Ptr_Ptr))->Root, ((NDT_Node *)(*Node1_Ptr_Ptr))->Index, *Node1_Ptr_Ptr, NDD_CMD_VALUE_COMP, ((NDT_Node *)(*Node1_Ptr_Ptr))->Value, ((NDT_Node *)(*Node2_Ptr_Ptr))->Value, NULL);
+    rc = ND_Manager_Exec_I( ( ( NDT_Node *)( *Node1_Ptr_Ptr))->Root, ( ( NDT_Node *)(*Node1_Ptr_Ptr))->Index, *Node1_Ptr_Ptr, NDD_CMD_VALUE_COMP, ( (NDT_Node *) (*Node1_Ptr_Ptr))->Value, ( ( NDT_Node *)( *Node2_Ptr_Ptr))->Value, NULL);

    switch( (int)rc)
    {
-        case NDS_EQUAL: return 0;
-        case NDS_LOWER: return -1;
-        case NDS_GREATER: return 1;
+        case NDS_EQUAL:   return(  0);
+	case NDS_LOWER:   return( -1);
+	case NDS_GREATER: return(  1);

        default:
+	{
            sprintf( NDG_Base.Err_String, "Error ND_Node_Compare : incorrect return code from the manager: %d", rc);
-            ND_Error_Print ();
-            return 0;
+            ND_Error_Print();
+
+            return( 0);
+	}
    }
 }

@@ -5139,23 +5196,20 @@ NDT_Status ND_List_Sort( NDT_Root  *Root_Ptr, NDT_Index_Id  Index_Id)

    /* Tri du tableau de pointeurs de noeuds */

-//    Tmp_Root = Root;
-
-    //    qsort( (void *)tab, (size_t)(Root_Ptr->Index_Tab[Index_Id].Node_Number), sizeof(NDT_Node *), (int (__cdecl *)(const void *, const void *))&ND_Node_Compare);
-    qsort( (void *)tab, (size_t)(Root_Ptr->Index_Tab[Index_Id].Node_Number), sizeof(NDT_Node *), (int (*)(const void *, const void *))&ND_Node_Compare);
+    qsort( (void *)tab, (size_t)( Root_Ptr->Index_Tab[Index_Id].Node_Number), sizeof( NDT_Node *), ( int (*)( const void *, const void *))&ND_Node_Compare);

    /* On met à jour les liens entre les noeuds */

-    for (i = 0; i < Root_Ptr->Index_Tab[Index_Id].Node_Number; i++)
+    for( i = 0; i < Root_Ptr->Index_Tab[Index_Id].Node_Number; i++)
    {
        node_ptr = (NDT_Node *)tab[i];

-        node_ptr->Left = (i ? (NDT_Node *)(tab[i - 1]) : NULL);
-        node_ptr->Right = (i != Root_Ptr->Index_Tab[Index_Id].Node_Number - 1 ? (NDT_Node *)(tab[i + 1]) : NULL);
+        node_ptr->Left = (i ? (NDT_Node *)( tab[i - 1]) : NULL);
+        node_ptr->Right = (i != Root_Ptr->Index_Tab[Index_Id].Node_Number - 1 ? (NDT_Node *)( tab[i + 1]) : NULL);
    }

-    Root_Ptr->Index_Tab[Index_Id].Head = (NDT_Node *)(tab[0]);
-    Root_Ptr->Index_Tab[Index_Id].Tail = (NDT_Node *)(tab[Root_Ptr->Index_Tab[Index_Id].Node_Number - 1]);
+    Root_Ptr->Index_Tab[Index_Id].Head = (NDT_Node *)( tab[0]);
+    Root_Ptr->Index_Tab[Index_Id].Tail = (NDT_Node *)( tab[Root_Ptr->Index_Tab[Index_Id].Node_Number - 1]);

    /* Désallocation du tableau */

@@ -5178,7 +5232,7 @@ NDT_Node  *ND_Tree_Node_First_Recursive_Get( NDT_Node  *Node_Ptr)
 {
    if( !Node_Ptr) return NULL;

-    if( !Node_Ptr->Left) return(Node_Ptr);
+    if( !Node_Ptr->Left) return( Node_Ptr);

    return( ND_Tree_Node_First_Recursive_Get( Node_Ptr->Left));
 }
@@ -5197,7 +5251,7 @@ NDT_Node  *ND_Tree_Node_Last_Recursive_Get( NDT_Node  *Node_Ptr)
 {
    if( !Node_Ptr) return NULL;

-    if( !Node_Ptr->Right) return(Node_Ptr);
+    if( !Node_Ptr->Right) return( Node_Ptr);

    return ND_Tree_Node_Last_Recursive_Get( Node_Ptr->Right);
 }
@@ -5207,15 +5261,15 @@ NDT_Node  *ND_Tree_Node_Last_Recursive_Get( NDT_Node  *Node_Ptr)


 /*------------------------------------------------------------------------------*/
-/* Redéfinition de la fonction malloc () avec retour de type NDT_Status         */
+/* Redéfinition de la fonction malloc() avec retour de type NDT_Status          */
 /*------------------------------------------------------------------------------*/

-NDT_Status  ND_Default_Allocator( size_t  Size, void  **Ptr_Ptr, void  *Data_Ptr)
+NDT_Status  ND_Default_Allocator( void  **Ptr_Ptr, size_t  Size, void  *Data_Ptr)
 {
-    *Ptr_Ptr = malloc(Size);
+    *Ptr_Ptr = malloc( Size);


-    if( !*Ptr_Ptr) return(NDS_ERRMEM);
+    if( !*Ptr_Ptr) return( NDS_ERRMEM);

    return( NDS_OK);
 }
@@ -5225,12 +5279,12 @@ NDT_Status  ND_Default_Allocator( size_t  Size, void  **Ptr_Ptr, void  *Data_Ptr


 /*------------------------------------------------------------------------------*/
-/* Redéfinition de la fonction free () avec retour de type NDT_Status            */
+/* Redéfinition de la fonction free() avec retour de type NDT_Status            */
 /*------------------------------------------------------------------------------*/

 NDT_Status  ND_Default_Desallocator( void  *Ptr, void  *Data_Ptr)
 {
-    if( !Ptr) return(NDS_ERRAPI);
+    if( !Ptr) return( NDS_ERRAPI);

    free( Ptr);

@@ -5560,31 +5614,126 @@ void  ND_Tree_Link_Recursive_Check( NDT_Node  *Node_Ptr, int  *Nb_Detected_Ptr,


 /*------------------------------------------------------------------------------*/
-/* Vérifie qu'une adresse est valide                                            */
+/* Target address access try                                                    */
 /*------------------------------------------------------------------------------*/

 NDT_Status  ND_Address_Check( void  *Address)
 {
+#if !defined(_MSC_VER)
+    NDT_Status        status;
+    int               rc;
    int               test;
+    struct sigaction  act = {0}, oact_bus, oact_segv;
+
+    act.sa_handler = ND_Signal_Trap;
+
+    NDG_Base.Sig_Trapped = 0;
+
+
+
+    /* Trap SIGBUS and SIGSEGV */
+
+    if( ( rc = sigaction( SIGBUS, &act, &oact_bus)) != 0)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Add SIGBUS Hdl) rc: %d   errno: %d", rc, errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+    if( ( rc = sigaction( SIGSEGV, &act, &oact_segv)) != 0)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Add SIGSEGV Hdl) rc: %d   errno: %d", rc, errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+
+
+    /* Target address access try */
+
+    if( sigsetjmp( NDG_Base.SigLongJmp_Env, 1) == 0 )
+    {
+	test = *( (int *)Address);
+
+	status = NDS_OK;
+    }
+    else
+    {
+	status = NDS_KO;
+    }
+
+
+
+    /* Untrap SIGBUS and SIGSEGV */
+
+    if( ( rc = sigaction( SIGBUS, &oact_bus, &act)) != 0)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Remove SIGBUS Hdl) rc: %d   errno: %d", rc, errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+    if( ( rc = sigaction( SIGSEGV, &oact_segv, &act)) != 0)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: sigaction (Remove SIGSEGV Hdl) rc: %d   errno: %d", rc, errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+    return( status);
+#else
+    NDT_Status      status;
+    int             test;
+    void (__cdecl  *old_sigsegv_sighandler)(int);


    NDG_Base.Sig_Trapped = 0;

-    /* On trappe les signaux SIGBUS et SIGSEGV */

-//    signal( SIGBUS, NDG_Base.Signal_Trap);  Win32
-//    signal( SIGSEGV, NDG_Base.Signal_Trap); Win32

-    /* On tente d'accéder à l'adresse fournie */
+    /* Trap SIGSEGV */

+    if( ( old_sigsegv_sighandler = signal( SIGSEGV, ND_Signal_Trap)) == SIG_ERR)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: signal (Add SIGSEGV Hdl) errno: %d", errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+
+
+    /* Target address access try */
+
+    if( setjmp( NDG_Base.SigLongJmp_Env) == 0 )
+    {
 	test = *( (int *)Address);

-//    sigrelse( SIGBUS); Win32
-//    sigrelse( SIGSEGV); Win32
+	status = NDS_OK;
+    }
+    else
+    {
+	status = NDS_KO;
+    }

-    if( NDG_Base.Sig_Trapped != 0) return( NDS_KO);

-    return( NDS_OK);
+
+    /* Untrap SIGSEGV */
+
+    if( ( old_sigsegv_sighandler = signal( SIGSEGV, old_sigsegv_sighandler)) == SIG_ERR)
+    {
+	sprintf( NDG_Base.Err_String, "Error ND_Address_Check: signal (Remove SIGSEGV Hdl) errno: %d", errno);
+	ND_Error_Print();
+
+	return( NDS_KO);
+    }
+
+    return( status);
+#endif
 }


@@ -5598,6 +5747,12 @@ NDT_Status  ND_Address_Check( void  *Address)
 void  ND_Signal_Trap( int  Sig_Num)
 {
    NDG_Base.Sig_Trapped = Sig_Num;
+
+#if !defined(_MSC_VER)
+    siglongjmp( NDG_Base.SigLongJmp_Env, 1);
+#else
+    longjmp( NDG_Base.SigLongJmp_Env, 1);
+#endif
 }


--- a/lib/libnode.h
+++ b/lib/libnode.h
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: libnode.h,v $							   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.5 $								   */
+/* $Revision: 2.8 $								   */
 /* $Name:  $									   */
-/* $Date: 2004/08/01 23:18:38 $							   */
+/* $Date: 2005/01/11 20:57:04 $							   */
 /* $Author: agibert $							           */
 /*---------------------------------------------------------------------------------*/

@@ -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>


@@ -52,7 +61,7 @@



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



@@ -78,7 +87,13 @@ typedef struct NDT_Base
 	char             Err_String[512];
 	FILE            *Err_Stream;
 	int              Sig_Trapped;
+#if !defined(_MSC_VER)
+	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;
@@ -88,17 +103,17 @@ NDT_Base  NDG_Base =
    NDD_FALSE,
    NDD_TRUE,
    "",
-    (FILE *)-1,
+    (FILE *) -1,
    0,
-    (NDT_Symbol  *)NULL,
+    {0},
+    (NDT_Symbol  *) NULL,
+    NULL,
    { NDD_INDEX_STATUS_OPENED | NDD_INDEX_TYPE_LIST | NDD_INDEX_SUBTYPE_FIFO},
-    (NDT_Root  *)NULL
+    (NDT_Root  *)   NULL
 };



-//extern int sigrelse (int sig);
-


 /*------------------------------------------------------------------------------*/
@@ -124,7 +139,7 @@ NDT_Status  ND_OpenStruct_Manager( NDT_Root  *, NDT_Index_Id, NDT_Node  *, NDT_C
 /*------------------------------------------------------------------------------*/
 /* 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            */
@@ -218,7 +233,7 @@ 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        */
@@ -282,9 +297,14 @@ int ND_Node_Compare( void  **, void  **);
 /*------------------------------------------------------------------------------*/
 NDT_Status  ND_List_Sort( NDT_Root  *, NDT_Index_Id);

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

@@ -300,28 +320,28 @@ 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_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  *);
+NDT_Node  *ND_Tree_Node_First_Recursive_Get( NDT_Node  *);

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

-NDT_Node * ND_Tree_Node_Recursive_Find( NDT_Node  *, void  *, 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  *);
+NDT_Node  *ND_Tree_Parent_Previous_Recursive_Get( NDT_Node  *);

 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_Signal_Trap( int);

-NDT_Status ND_Address_Check(void  *);
+NDT_Status  ND_Address_Check( void  *);
--- a/libnode.spec
+++ b/libnode.spec
@@ -1,5 +1,5 @@
 Name: libnode
-Version: 2.0.5
+Version: 2.0.7
 Release: 1

 %define libnode_name  %{name}-%{version}-%{release}
@@ -10,7 +10,7 @@ Copyright: GPL
 Group: Application/Utilitaires
 Distribution: Rx3 OpenSource
 Vendor: Rx3
-Packager: arnaud.gibert@rx3.net
+Packager: Arnaud G. Gibert <arnaud@rx3.net>

 Source: ftp://ftp.rx3.org/pub/%{source}
 Url: http://www.rx3.org/dvp/libnode/download/
@@ -18,7 +18,7 @@ BuildRoot: %{_tmppath}/%{libnode_name}-buildroot
 AutoReqProv: no

 %description
-Manages generic list and/or tree node structures
+Manages generic list and/or tree node structures.



@@ -49,6 +49,12 @@ rm -rf $RPM_BUILD_ROOT


 %changelog
+* 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.

--- a/util/Makefile
+++ b/util/Makefile
@@ -11,12 +11,13 @@ 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
-LIB_DYNAMIC = -lnode
+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
@@ -28,11 +29,11 @@ ifdef _LIBVER_SUPPORT
                LIB_STATIC  += ../../libver/lib/libver.a
                LIB_DYNAMIC += -lver
        else
-                LIB_STATIC  += -ldl ../../libver/lib/libver.a
-                LIB_DYNAMIC += -ldl -lver
+                LIB_STATIC  += ../../libver/lib/libver.a
+                LIB_DYNAMIC += -lver
        endif

-        CFLAGS              += -D_LIBVER_SUPPORT -rdynamic
+        CFLAGS              += -D_LIBVER_SUPPORT
 endif

 ND_CHECK_FLAGS   = -DND_MODE=0
--- a/util/ndbench.c
+++ b/util/ndbench.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: ndbench.c,v $                                                         */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.7 $                                                                */
+/* $Revision: 2.8 $                                                                */
 /* $Name:  $                                                                       */
-/* $Date: 2004/08/01 23:38:52 $                                                    */
+/* $Date: 2004/08/24 20:31:28 $                                                    */
 /* $Author: agibert $                                                              */
 /*---------------------------------------------------------------------------------*/

@@ -59,7 +59,7 @@
 /*---------------------------------------------------------------------------------*/

 #ifdef _LIBVER_SUPPORT
-VER_INFO_EXPORT( ndbench, "$Revision: 2.7 $", "$Name:  $", __FILE__, "$Author: agibert $");
+VER_INFO_EXPORT( ndbench, "$Revision: 2.8 $", "$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"
@@ -94,9 +94,11 @@ VER_INFO_EXPORT( ndbench, "$Revision: 2.7 $", "$Name:  $", __FILE__, "$Author: a
 #define INDEX_REORG             22
 #define INDEX_INFO_PRINT        23
 #define INDEX_VALUE_PRINT       24
-#define BATCH_RUN               25
+#define INDEX_VALUE_BREAK       25
+#define INDEX_NODE_BREAK        26
+#define BATCH_RUN               27

-#define COMMAND_NB              26
+#define COMMAND_NB              28

 #define INDEX_NB                32

@@ -151,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

@@ -161,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

@@ -241,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)}
 };

@@ -265,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.7 $   $Name:  $   $Date: 2004/08/01 23:38:52 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.8 $   $Name:  $   $Date: 2004/08/24 20:31:28 $   $Author: agibert $";

            return( NDS_OK);
        }
@@ -1001,7 +1007,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++;
 		}
@@ -1090,6 +1096,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)
@@ -1102,9 +1111,9 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 		    Arg2 = buf;
 		}

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

-                switch( Choice)
+                switch( subtype)
                {
                    case 0:
                    {
@@ -1127,7 +1136,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;
                    }
                }
@@ -1161,6 +1170,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)
@@ -1173,9 +1185,9 @@ void  Command_Exec( NDT_Root  **DS_Ptr_Ptr, FILE  *File_Output, int  Choice, cha
 		    Arg2 = buf;
 		}

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

-                switch( Choice)
+                switch( subtype)
                {
                    case 0:
                    {
@@ -1192,7 +1204,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;
                    }
 		}
@@ -1301,7 +1313,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++)
@@ -1322,6 +1334,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");
@@ -1431,11 +1525,19 @@ 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;


+    /* Init Random numbers... */
+
+    t_start( t_exec);
+    t_stop( t_exec);
+    srand( seed_get(t_exec));
+
+
+
    /* Args Parsing */

    if( argc >= 2)
--- a/util/test-error.ndb
+++ b/util/test-error.ndb
@@ -8,4 +8,8 @@ Lib_Open 1
 DS_Open
 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	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