Merge commit '045db1657e870c721be490b411868f4181a12ced' into surf++

[simgrid.git] / src / instr / instr_paje_values.c

diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c
index b6f1e60..a2e5748 100644 (file)
--- a/src/instr/instr_paje_values.c
+++ b/src/instr/instr_paje_values.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2013. The SimGrid Team.

  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it


@@ -32,15 +32,16 @@ val_t PJ_value_new (const char *name, const char *color, type_t father)
 
 val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
 {
 
 val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
 {

+  val_t ret = 0;

   xbt_ex_t e;
   TRY {
   xbt_ex_t e;
   TRY {

-    return PJ_value_get(name, father);
+    ret = PJ_value_get(name, father);

   }
   CATCH(e) {
     xbt_ex_free(e);
   }
   CATCH(e) {
     xbt_ex_free(e);

-    return PJ_value_new(name, color, father);
+    ret = PJ_value_new(name, color, father);

   }
   }

-  THROW_IMPOSSIBLE;
+  return ret;

 }
 
 val_t PJ_value_get (const char *name, type_t father)
 }
 
 val_t PJ_value_get (const char *name, type_t father)