Fix compilation error on windows.

[simgrid.git] / src / xbt / dict_cursor.c

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index 807e591..a83c005 100644 (file)
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -1,6 +1,6 @@
 /* dict_cursor - iterators over dictionnaries                               */
 
-/* Copyright (c) 2004, 2005, 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2004-2011. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -21,7 +21,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
 /* To traverse (simple) dicts                                               */
 /* Don't add or remove entries to the dict while traversing !!!             */
 /*###########################################################################*/
-struct xbt_dict_cursor_ {
+struct s_xbt_dict_cursor {
   xbt_dictelm_t current;
   int line;
   xbt_dict_t dict;
@@ -51,10 +51,8 @@ XBT_INLINE xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
  */
 XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
 {
-  if (*cursor) {
-    xbt_free(*cursor);
-    *cursor = NULL;
-  }
+  xbt_free(*cursor);
+  *cursor = NULL;
 }
 
 /*
@@ -62,14 +60,14 @@ XBT_INLINE void xbt_dict_cursor_free(xbt_dict_cursor_t * cursor)
  */
 static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor)
 {
-  xbt_assert0(cursor, "Null cursor");
+  xbt_assert(cursor, "Null cursor");
 }
 
 
 /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */
 XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
 {
-  CDEBUG0(xbt_dict_cursor, "xbt_dict_cursor_rewind");
+  XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind");
   xbt_assert(cursor);
 
   cursor->line = 0;
@@ -86,11 +84,12 @@ XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
  * @param      dict   on what to let the cursor iterate
  * @param[out] cursor dest address
  */
-XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor)
+XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict,
+                                      xbt_dict_cursor_t * cursor)
 {
-  DEBUG0("xbt_dict_cursor_first");
+  XBT_DEBUG("xbt_dict_cursor_first");
   if (!*cursor) {
-    DEBUG0("Create the cursor on first use");
+    XBT_DEBUG("Create the cursor on first use");
     *cursor = xbt_dict_cursor_new(dict);
   } else {
     xbt_dict_cursor_rewind(*cursor);
@@ -109,7 +108,7 @@ XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
   xbt_dictelm_t current;
   int line;
 
-  DEBUG0("xbt_dict_cursor_step");
+  XBT_DEBUG("xbt_dict_cursor_step");
   xbt_assert(cursor);
 
   current = cursor->current;
@@ -118,17 +117,17 @@ XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
   if (cursor->dict != NULL) {
 
     if (current != NULL) {
-      DEBUG0("current is not null, take the next element");
+      XBT_DEBUG("current is not null, take the next element");
       current = current->next;
-      DEBUG1("next element: %p", current);
+      XBT_DEBUG("next element: %p", current);
     }
 
     while (current == NULL && ++line <= cursor->dict->table_size) {
-      DEBUG0("current is NULL, take the next line");
+      XBT_DEBUG("current is NULL, take the next line");
       current = cursor->dict->table[line];
-      DEBUG1("element in the next line: %p", current);
+      XBT_DEBUG("element in the next line: %p", current);
     }
-    DEBUG2("search finished, current = %p, line = %d", current, line);
+    XBT_DEBUG("search finished, current = %p, line = %d", current, line);
 
     cursor->current = current;
     cursor->line = line;
@@ -141,12 +140,12 @@ XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
  * @returns true if it's ok, false if there is no more data
  */
 XBT_INLINE int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
-                                char **key, void **data)
+                                           char **key, void **data)
 {
 
   xbt_dictelm_t current;
 
-  DEBUG0("xbt_dict_get_or_free");
+  XBT_DEBUG("xbt_dict_get_or_free");
 
 
   if (!cursor || !(*cursor))
@@ -194,16 +193,9 @@ XBT_INLINE void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
  * @param free_ctn the function to free the new data
  */
 XBT_INLINE void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor,
-                                         void *data, void_f_pvoid_t free_ctn)
+                                         void *data,
+                                         void_f_pvoid_t free_ctn)
 {
   __cursor_not_null(cursor);
-  if(cursor->current->free_f)
-    cursor->current->free_f(cursor->current->content);
-  
-  cursor->current->content = data;
-  cursor->current->free_f = free_ctn;
-  return;
+  xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);
 }
-
-
-