- Rename ND_DataStruct_Alloc() & ND_DataStruct_Free() into ND_Alloc() & ND_Free(),

- Use ND_Alloc() & ND_Free() into ndbench.
This commit is contained in:
2024-05-04 12:10:31 +02:00
parent afbf19b5a3
commit 2417b2829e
3 changed files with 57 additions and 50 deletions

View File

@@ -174,10 +174,13 @@ cpt t_exec;
/* Définition des valeurs attachées aux noeuds de la structure */
# define NAME_LEN 64
# define NAME_SIZE ( NAME_LEN + 1)
typedef struct
{
int Id;
char *Nom;
char Name[ NAME_SIZE];
} T_Module;
@@ -332,7 +335,7 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
ND_VA_LIST_OPEN( user_args, *Args_Ptr);
ND_VA_ARG_GET( Nom, user_args, char *);
ND_VA_ARG_GET( Name, user_args, char *);
ND_VA_ARG_GET( Id, user_args, int);
ND_VA_LIST_CLOSE( user_args);
@@ -340,18 +343,18 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
Command_Name = "NDD_CMD_VALUE_ALLOC";
if( ( *Module_Ptr_Ptr = (T_Module *)malloc( sizeof(T_Module))) != NULL)
{
(*Module_Ptr_Ptr)->Nom = strdup(Nom);
(*Module_Ptr_Ptr)->Id = Id;
return( NDS_OK);
}
else
if( ( ND_Alloc( (void **)Module_Ptr_Ptr, Root_Ptr, sizeof(T_Module), NULL)) != NDS_OK)
{
return( NDS_KO);
}
else
{
strncpy( ( *Module_Ptr_Ptr)->Name, Name, NAME_LEN);
( *Module_Ptr_Ptr)->Name[ NAME_LEN] = '\0';
( *Module_Ptr_Ptr)->Id = Id;
return( NDS_OK);
}
}
case NDD_CMD_VALUE_FREE:
@@ -373,10 +376,14 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
Command_Name = "NDD_CMD_VALUE_FREE";
free( Module_Ptr->Nom);
free( Module_Ptr);
return( NDS_OK);
if( ( ND_Free( (void *)Module_Ptr, Root_Ptr, NULL)) != NDS_OK)
{
return( NDS_KO);
}
else
{
return( NDS_OK);
}
}
case NDD_CMD_VALUE_COMP:
@@ -508,7 +515,7 @@ NDT_Status Module_Manager( NDT_Root *Root_Ptr, NDT_Index_Id Index_Id, NDT_Nod
Command_Name = "NDD_CMD_VALUE_PRINT";
fprintf( Out, "Id=%d\tNom=\"%s\"\n", Module_Ptr->Id, Module_Ptr->Nom);
fprintf( Out, "Id=%d\tName: [%s]\n", Module_Ptr->Id, Module_Ptr->Name);
return( NDS_OK);
}