From: Arnaud Giersch Date: Fri, 25 Nov 2011 17:17:15 +0000 (+0100) Subject: Rename dict structs to follow README.coding. X-Git-Tag: exp_20120216~241^2~41 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/633319c6b212fa639f817c643c87a983f647de03?ds=sidebyside Rename dict structs to follow README.coding. --- diff --git a/include/xbt/dict.h b/include/xbt/dict.h index f5256cf214..cb5cde6ef4 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -43,7 +43,7 @@ SG_BEGIN_DECL() */ /** \brief Dictionary data type (opaque structure) */ -typedef struct xbt_dict_ *xbt_dict_t; +typedef struct s_xbt_dict *xbt_dict_t; XBT_PUBLIC(xbt_dict_t) xbt_dict_new(void); XBT_PUBLIC(void) xbt_dict_free(xbt_dict_t * dict); XBT_PUBLIC(unsigned int) xbt_dict_size(xbt_dict_t dict); @@ -120,7 +120,7 @@ XBT_PUBLIC(void) xbt_dicti_remove(xbt_dict_t dict, uintptr_t key); * @{ */ /** @brief Cursor on dictionaries (opaque type) */ -typedef struct xbt_dict_cursor_ *xbt_dict_cursor_t; +typedef struct s_xbt_dict_cursor *xbt_dict_cursor_t; XBT_PUBLIC(xbt_dict_cursor_t) xbt_dict_cursor_new(const xbt_dict_t dict); XBT_PUBLIC(void) xbt_dict_cursor_free(xbt_dict_cursor_t * cursor); diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 6d7f27703e..8d78868393 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -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; diff --git a/src/xbt/dict_private.h b/src/xbt/dict_private.h index 7bf451479d..7234372921 100644 --- a/src/xbt/dict_private.h +++ b/src/xbt/dict_private.h @@ -17,11 +17,11 @@ #include "xbt/dict.h" #include "xbt/mallocator.h" -typedef struct xbt_dictelm_ *xbt_dictelm_t; +typedef struct s_xbt_dictelm *xbt_dictelm_t; #define MAX_FILL_PERCENT 80 -typedef struct xbt_dictelm_ { +typedef struct s_xbt_dictelm { int dictielem:1; char *key; int key_len; @@ -33,14 +33,14 @@ typedef struct xbt_dictelm_ { xbt_dictelm_t next; } s_xbt_dictelm_t; -typedef struct xbt_dict_ { +typedef struct s_xbt_dict { xbt_dictelm_t *table; int table_size; int count; int fill; } s_xbt_dict_t; -typedef struct xbt_dict_cursor_ s_xbt_dict_cursor_t; +typedef struct s_xbt_dict_cursor s_xbt_dict_cursor_t; extern xbt_mallocator_t dict_elm_mallocator; extern void *dict_elm_mallocator_new_f(void);