From b7ce3250e1d69b766f727c4fd03868b9cd86c483 Mon Sep 17 00:00:00 2001
From: agibert <agibert>
Date: Sun, 26 Jun 2005 22:41:10 +0000
Subject: [PATCH] In Library Debug Mode, only perform OpenStruct tracking on
 local DataStruct: Manager_Ptr != NULL. Improve LibShMem support.

---
 lib/libnode.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/libnode.c b/lib/libnode.c
index cb7b109..a807d35 100644
--- a/lib/libnode.c
+++ b/lib/libnode.c
@@ -1,9 +1,9 @@
 /*---------------------------------------------------------------------------------*/
 /* $RCSfile: libnode.c,v $							   */
 /*---------------------------------------------------------------------------------*/
-/* $Revision: 2.15 $								   */
+/* $Revision: 2.16 $								   */
 /* $Name:  $									   */
-/* $Date: 2005/01/19 23:59:41 $							   */
+/* $Date: 2005/06/26 22:41:10 $							   */
 /* $Author: agibert $								   */
 /*---------------------------------------------------------------------------------*/
 
@@ -34,7 +34,7 @@
 #include <libnode.h>
 
 #ifdef _LIBVER_SUPPORT
-VER_INFO_EXPORT( libnode, "$Revision: 2.15 $", "$Name:  $", __FILE__, "$Author: agibert $")
+VER_INFO_EXPORT( libnode, "$Revision: 2.16 $", "$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.15 $   $Name:  $   $Date: 2005/01/19 23:59:41 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.16 $   $Name:  $   $Date: 2005/06/26 22:41:10 $   $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.15 $   $Name:  $   $Date: 2005/01/19 23:59:41 $   $Author: agibert $";
+            *Version_Name_Ptr = "$Revision: 2.16 $   $Name:  $   $Date: 2005/06/26 22:41:10 $   $Author: agibert $";
 
             return( NDS_OK);
 	}
@@ -607,7 +607,7 @@ NDT_Status  ND_Library_Open_I( int  Debug_Mode)
 #if !defined(_WIN32)
     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());
+        sprintf( NDG_Base.Err_String, "Error ND_Library_Open_I: can't dlopen [%s]", dlerror());
         ND_Error_Print();
 
         return( NDS_KO);
@@ -684,7 +684,7 @@ NDT_Status  ND_Library_Close_I( void)
 #if !defined(_WIN32)
     if( dlclose( NDG_Base.DL_Ptr) != 0)
     {
-        sprintf( NDG_Base.Err_String, "Error ND_Library_Open: can't dlclose [%s]", dlerror());
+        sprintf( NDG_Base.Err_String, "Error ND_Library_Close_I: can't dlclose [%s]", dlerror());
         ND_Error_Print();
 
         return( NDS_KO);
@@ -1036,7 +1036,7 @@ NDT_Status  ND_DataStruct_Open_C( NDT_Root  **Root_Ptr_Ptr, NDT_Index_Nb  Index_
 	return( status);
     }
 
-    if( ( NDG_Base.Debug_Mode == NDD_TRUE) && ( NDG_Base.Open_Status == NDD_TRUE))
+    if( ( NDG_Base.Debug_Mode == NDD_TRUE) && ( Manager_Ptr != NULL) && ( NDG_Base.Open_Status == NDD_TRUE))
     {
         if( ( status = ND_DataStruct_Value_Add_I( NDG_Base.OpenStruct_Ptr, (void  **)*Root_Ptr_Ptr)) != NDS_OK)
         {