X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/660f9807d0a906180dc31227b4c1ed744b2b2478..997eaf52ad0ae1eb34820b135c7ba884b2a17f3c:/src/instr/jedule/jedule_platform.c

diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.c
index 9b21d5cf7e..ebcfa4bb4f 100644
--- a/src/instr/jedule/jedule_platform.c
+++ b/src/instr/jedule/jedule_platform.c
@@ -10,7 +10,9 @@
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
-#include "jedule_platform.h"
+#include "instr/jedule/jedule_platform.h"
+
+#ifdef HAVE_JEDULE
 
 /********************************************************************/
 
@@ -30,7 +32,9 @@ static void jed_free_container(jed_simgrid_container_t container);
 /********************************************************************/
 
 static int compare_hostnames(const void *host1, const void *host2) {
-	return strcmp ((char*)host1, (char*)host2);
+	const char *hp1 = *((const char**) host1);
+	const char *hp2 = *((const char**) host2);
+	return strcmp (hp1, hp2);
 }
 
 static int compare_ids(const void *num1, const void *num2) {
@@ -42,9 +46,7 @@ static int compare_ids(const void *num1, const void *num2) {
 static void jed_free_container(jed_simgrid_container_t container) {
 
 	xbt_dict_free(&container->name2id);
-	if( container->resource_list != NULL ) {
-		xbt_dynar_free(&container->resource_list);
-	}
+	xbt_dynar_free(&container->resource_list);
 
 	if( container->container_children != NULL ) {
 		unsigned int iter;
@@ -62,8 +64,7 @@ void jed_simgrid_create_container(jed_simgrid_container_t *container, char *name
 	xbt_assert( name != NULL );
 
 	*container = (jed_simgrid_container_t)calloc(1,sizeof(s_jed_simgrid_container_t));
-	(*container)->name = (char*)calloc((strlen(name)+1), sizeof(char));
-	strcpy((*container)->name, name);
+	(*container)->name = xbt_strdup(name);
 	(*container)->is_lowest = 0;
 	(*container)->container_children = xbt_dynar_new(sizeof(jed_simgrid_container_t), NULL);
 	(*container)->parent = NULL;
@@ -95,7 +96,6 @@ void jed_simgrid_add_resources(jed_simgrid_container_t parent,
 	parent->last_id = 0;
 	parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
 
-
 	xbt_dynar_sort (host_names,	&compare_hostnames);
 
 	xbt_dynar_foreach(host_names, iter, host_name) {
@@ -280,4 +280,4 @@ void jed_free_jedule(jedule_t jedule) {
 	xbt_dict_free(&container_name2container);
 }
 
-
+#endif