X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0de7df8a3bc351fdff4c4a3e106608b15c842143..481328d4b3422afe2b97f7e9a5eda090bdffbbb5:/src/instr/jedule/jedule_events.c

diff --git a/src/instr/jedule/jedule_events.c b/src/instr/jedule/jedule_events.c
index 7f770004c8..e5175e9c0d 100644
--- a/src/instr/jedule/jedule_events.c
+++ b/src/instr/jedule/jedule_events.c
@@ -19,68 +19,66 @@
 #ifdef HAVE_JEDULE
 
 void jed_event_add_resources(jed_event_t event, xbt_dynar_t host_selection) {
-	xbt_dynar_t resource_subset_list;
-	jed_res_subset_t res_set;
-	int i;
+  xbt_dynar_t resource_subset_list;
+  jed_res_subset_t res_set;
+  unsigned int i;
 
-	resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), NULL);
+  resource_subset_list = xbt_dynar_new(sizeof(jed_res_subset_t), NULL);
 
-	jed_simgrid_get_resource_selection_by_hosts(resource_subset_list, host_selection);
-	xbt_dynar_foreach(resource_subset_list, i, res_set)  {
-		xbt_dynar_push(event->resource_subsets, &res_set);
-	}
+  jed_simgrid_get_resource_selection_by_hosts(resource_subset_list, host_selection);
+  xbt_dynar_foreach(resource_subset_list, i, res_set)  {
+    xbt_dynar_push(event->resource_subsets, &res_set);
+  }
 
-	xbt_dynar_free(&resource_subset_list);
+  xbt_dynar_free(&resource_subset_list);
 }
 
 void jed_event_add_characteristic(jed_event_t event, char *characteristic) {
-	xbt_assert( characteristic != NULL );
-	xbt_dynar_push(event->characteristics_list, &characteristic);
+  xbt_assert( characteristic != NULL );
+  xbt_dynar_push(event->characteristics_list, &characteristic);
 }
 
 
 void jed_event_add_info(jed_event_t event, char *key, char *value) {
-	char *val_cp;
+  char *val_cp;
 
-	xbt_assert(key != NULL);
-	xbt_assert(value != NULL);
+  xbt_assert(key != NULL);
+  xbt_assert(value != NULL);
 
-	val_cp = strdup(value);
-	xbt_dict_set(event->info_hash, key, val_cp, NULL);
+  val_cp = strdup(value);
+  xbt_dict_set(event->info_hash, key, val_cp, NULL);
 }
 
 
 void create_jed_event(jed_event_t *event, char *name, double start_time,
-		double end_time, char *type) {
+    double end_time, const char *type) {
 
-	*event = (jed_event_t) calloc(1, sizeof(s_jed_event_t));
-	(*event)->name = (char*) calloc(strlen(name) + 1, sizeof(char));
-	strcpy((*event)->name, name);
+  *event = (jed_event_t) calloc(1, sizeof(s_jed_event_t));
+  (*event)->name = xbt_strdup(name);
 
-	(*event)->start_time = start_time;
-	(*event)->end_time = end_time;
+  (*event)->start_time = start_time;
+  (*event)->end_time = end_time;
 
-	(*event)->type = (char*) calloc(strlen(type) + 1, sizeof(char));
-	strcpy((*event)->type, type);
+  (*event)->type = xbt_strdup(type);
 
-	(*event)->resource_subsets = xbt_dynar_new(sizeof(jed_res_subset_t), NULL);
-	(*event)->characteristics_list = xbt_dynar_new(sizeof(char*), NULL);
-	(*event)->info_hash = xbt_dict_new();
+  (*event)->resource_subsets = xbt_dynar_new(sizeof(jed_res_subset_t), NULL);
+  (*event)->characteristics_list = xbt_dynar_new(sizeof(char*), NULL);
+  (*event)->info_hash = xbt_dict_new_homogeneous(NULL);
 
 }
 
 
 void jed_event_free(jed_event_t event) {
 
-	free(event->name);
-	free(event->type);
+  free(event->name);
+  free(event->type);
 
-	xbt_dynar_free(&event->resource_subsets);
+  xbt_dynar_free(&event->resource_subsets);
 
-	xbt_dynar_free(&event->characteristics_list);
-	xbt_dict_free(&event->info_hash);
+  xbt_dynar_free(&event->characteristics_list);
+  xbt_dict_free(&event->info_hash);
 
-	free(event);
+  free(event);
 }
 
 #endif