X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfc676704bebcd57e5ea98bb43154245a150948f..4bd1f48f0bf1ad1703be680ec2a38d626c6a2668:/src/xbt/dict_cursor.c

diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c
index c1c52fde10..38c7930270 100644
--- a/src/xbt/dict_cursor.c
+++ b/src/xbt/dict_cursor.c
@@ -1,4 +1,4 @@
-/* dict_cursor - iterators over dictionnaries                               */
+/* dict_cursor - iterators over dictionaries                               */
 
 /* Copyright (c) 2004-2014. The SimGrid Team.
  * All rights reserved.                                                     */
@@ -12,9 +12,7 @@
 
 #include <string.h>             /* strlen() */
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
-                                "To traverse dictionaries");
-
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict, "To traverse dictionaries");
 
 /*####[ Dict cursor functions ]#############################################*/
 /* To traverse (simple) dicts                                               */
@@ -29,9 +27,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_dict_cursor, xbt_dict,
  */
 inline xbt_dict_cursor_t xbt_dict_cursor_new(const xbt_dict_t dict)
 {
-  xbt_dict_cursor_t res = NULL;
-
-  res = xbt_new(s_xbt_dict_cursor_t, 1);
+  xbt_dict_cursor_t res = xbt_new(s_xbt_dict_cursor_t, 1);
   res->dict = dict;
 
   xbt_dict_cursor_rewind(res);
@@ -57,7 +53,6 @@ static inline void __cursor_not_null(xbt_dict_cursor_t cursor)
   xbt_assert(cursor, "Null cursor");
 }
 
-
 /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */
 inline void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor)
 {
@@ -78,8 +73,7 @@ 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
  */
-inline void xbt_dict_cursor_first(const xbt_dict_t dict,
-                                      xbt_dict_cursor_t * cursor)
+inline void xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor)
 {
   XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_first");
   if (!*cursor) {
@@ -93,10 +87,7 @@ inline void xbt_dict_cursor_first(const xbt_dict_t dict,
   }
 }
 
-
-/**
- * \brief Move to the next element.
- */
+/** \brief Move to the next element. */
 inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
 {
   xbt_dictelm_t current;
@@ -109,14 +100,14 @@ inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
   line = cursor->line;
 
   if (cursor->dict != NULL) {
-
     if (current != NULL) {
       XBT_CDEBUG(xbt_dict_cursor, "current is not null, take the next element");
       current = current->next;
       XBT_CDEBUG(xbt_dict_cursor, "next element: %p", current);
     }
 
-    while (current == NULL && ++line <= cursor->dict->table_size) {
+    while (current == NULL && (line + 1) <= cursor->dict->table_size) {
+      line++;
       XBT_CDEBUG(xbt_dict_cursor, "current is NULL, take the next line");
       current = cursor->dict->table[line];
       XBT_CDEBUG(xbt_dict_cursor, "element in the next line: %p", current);
@@ -133,15 +124,12 @@ inline void xbt_dict_cursor_step(xbt_dict_cursor_t cursor)
  *
  * @returns true if it's ok, false if there is no more data
  */
-inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor,
-                                           char **key, void **data)
+inline int xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data)
 {
-
   xbt_dictelm_t current;
 
   XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_get_or_free");
 
-
   if (!cursor || !(*cursor))
     return FALSE;
 
@@ -186,9 +174,7 @@ inline void *xbt_dict_cursor_get_data(xbt_dict_cursor_t cursor)
  * @param data the new data
  * @param free_ctn the function to free the new data
  */
-inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor,
-                                         void *data,
-                                         void_f_pvoid_t free_ctn)
+inline void xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, void *data, void_f_pvoid_t free_ctn)
 {
   __cursor_not_null(cursor);
   xbt_dictelm_set_data(cursor->dict, cursor->current, data, free_ctn);