Fix some conflicts with modifications introduced in the svn branch

[simgrid.git] / src / msg / environment.c

diff --git a/src/msg/environment.c b/src/msg/environment.c
index 924e277..fa6accc 100644 (file)
--- a/src/msg/environment.c
+++ b/src/msg/environment.c
@@ -1,4 +1,4 @@
-/*     $Id: environment.c 5354 2008-04-30 08:55:54Z mquinson $      */
+/*     $Id$      */
 
 /* Copyright (c) 2002-2007 Arnaud Legrand.                                  */
 /* Copyright (c) 2007 Bruno Donassolo.                                      */
@@ -34,12 +34,12 @@
 m_host_t MSG_get_host_by_name(const char *name)
 {
   smx_host_t simix_h = NULL;
-
   simix_h = SIMIX_host_get_by_name(name);
-  if (simix_h == NULL) {
+  
+  if (simix_h == NULL)
     return NULL;
-  } else
-    return (m_host_t) simix_h->data;
+
+  return (m_host_t)SIMIX_host_get_data(simix_h);
 }
 
 /** \ingroup msg_easier_life
@@ -65,9 +65,10 @@ void MSG_create_environment(const char *file)
   char *name;
 
   SIMIX_create_environment(file);
+  SIMIX_init();
 
   /* Initialize MSG hosts */
-  xbt_dict_foreach(SIMIX_host_get_dict(),c,name,h) {
+  xbt_dict_foreach(SIMIX_host_get_dict(), c, name, h) {
     __MSG_host_create(h, NULL);
   }
   return;