Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[simgrid.git] / src / instr / jedule / jedule_platform.c

diff --git a/src/instr/jedule/jedule_platform.c b/src/instr/jedule/jedule_platform.c
index 29eda01..08fd7e7 100644 (file)
--- a/src/instr/jedule/jedule_platform.c
+++ b/src/instr/jedule/jedule_platform.c
@@ -1,16 +1,15 @@
-/*
- * jed_simgrid_platform.c
- *
- *  Created on: Nov 30, 2010
- *      Author: sascha
- */
+/* Copyright (c) 2010-2015. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include <stdlib.h>
 #include <string.h>
 #include "xbt/asserts.h"
 #include "xbt/dynar.h"
 
-#include "instr/jedule/jedule_platform.h"
+#include "simgrid/jedule/jedule_platform.h"
 
 #ifdef HAVE_JEDULE
 
@@ -61,7 +60,9 @@ static void jed_free_container(jed_simgrid_container_t container) {
   xbt_free(container);
 }
 
-void jed_simgrid_create_container(jed_simgrid_container_t *container, char *name) {
+void jed_simgrid_create_container(jed_simgrid_container_t *container,
+                                  const char *name)
+{
   xbt_assert( name != NULL );
 
   *container = xbt_new0(s_jed_simgrid_container_t,1);
@@ -92,7 +93,7 @@ void jed_simgrid_add_resources(jed_simgrid_container_t parent,
   parent->is_lowest = 1;
   xbt_dynar_free(&parent->container_children);
   parent->container_children = NULL;
-  parent->name2id = xbt_dict_new_homogeneous(xbt_free);
+  parent->name2id = xbt_dict_new_homogeneous(xbt_free_f);
   parent->last_id = 0;
   parent->resource_list = xbt_dynar_new(sizeof(char *), NULL);
 
@@ -257,7 +258,7 @@ void jedule_add_meta_info(jedule_t jedule, char *key, char *value) {
   xbt_assert(key != NULL);
   xbt_assert(value != NULL);
 
-  val_cp = strdup(value);
+  val_cp = xbt_strdup(value);
   xbt_dict_set(jedule->jedule_meta_info, key, val_cp, NULL);
 }