From: Navarrop Date: Thu, 8 Sep 2011 12:09:39 +0000 (+0200) Subject: Re-apply old patch A. Giersch 06/07/2010 X-Git-Tag: v3_6_2~135 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/3a9be3b03e764af6a69418124a4e213713b2fd6d Re-apply old patch A. Giersch 06/07/2010 [From A. Giersch] Fix the following compilation warnings in ISO-C99 mode: * inline function ‘xxx’ declared but never defined --- diff --git a/include/xbt/dict.h b/include/xbt/dict.h index 8a26fc58f0..215da99694 100644 --- a/include/xbt/dict.h +++ b/include/xbt/dict.h @@ -124,7 +124,7 @@ typedef struct 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); -XBT_INLINE XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t +XBT_PUBLIC(void) xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor); @@ -136,7 +136,7 @@ XBT_PUBLIC(void) xbt_dict_cursor_set_data(xbt_dict_cursor_t cursor, XBT_PUBLIC(void) xbt_dict_cursor_first(const xbt_dict_t dict, xbt_dict_cursor_t * cursor); -XBT_INLINE XBT_PUBLIC(void) xbt_dict_cursor_step(xbt_dict_cursor_t cursor); +XBT_PUBLIC(void) xbt_dict_cursor_step(xbt_dict_cursor_t cursor); XBT_PUBLIC(int) xbt_dict_cursor_get_or_free(xbt_dict_cursor_t * cursor, char **key, void **data); /** @def xbt_dict_foreach diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index 67418d11d9..c72bec53d8 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -66,7 +66,7 @@ XBT_PUBLIC(xbt_dynar_t) xbt_dynar_new(const unsigned long elm_size, void_f_pvoid_t const free_f); XBT_PUBLIC(xbt_dynar_t) xbt_dynar_new_sync(const unsigned long elm_size, void_f_pvoid_t const free_f); -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_free(xbt_dynar_t * dynar); +XBT_PUBLIC(void) xbt_dynar_free(xbt_dynar_t * dynar); XBT_PUBLIC(void) xbt_dynar_free_voidp(void *dynar); XBT_PUBLIC(void) xbt_dynar_free_container(xbt_dynar_t * dynar); XBT_PUBLIC(void) xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots); @@ -109,9 +109,9 @@ XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_to_array (xbt_dynar_t dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t +XBT_PUBLIC(unsigned long) xbt_dynar_length(const xbt_dynar_t dynar); -XBT_INLINE XBT_PUBLIC(int) xbt_dynar_is_empty(const xbt_dynar_t dynar); +XBT_PUBLIC(int) xbt_dynar_is_empty(const xbt_dynar_t dynar); XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t const dynar); @@ -122,9 +122,9 @@ XBT_PUBLIC(void) xbt_dynar_reset(xbt_dynar_t const dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_push(xbt_dynar_t const dynar, +XBT_PUBLIC(void) xbt_dynar_push(xbt_dynar_t const dynar, const void *src); -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_pop(xbt_dynar_t const dynar, +XBT_PUBLIC(void) xbt_dynar_pop(xbt_dynar_t const dynar, void *const dst); XBT_PUBLIC(void) xbt_dynar_unshift(xbt_dynar_t const dynar, const void *src); @@ -143,7 +143,7 @@ XBT_PUBLIC(void) xbt_dynar_map(const xbt_dynar_t dynar, XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_set_at_ptr(const xbt_dynar_t dynar, const unsigned long idx); -XBT_INLINE XBT_PUBLIC(void *) xbt_dynar_get_ptr(const xbt_dynar_t dynar, +XBT_PUBLIC(void *) xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx); XBT_PUBLIC(void *) xbt_dynar_insert_at_ptr(xbt_dynar_t const dynar, const int idx); @@ -208,7 +208,7 @@ XBT_PUBLIC(void *) xbt_dynar_pop_ptr(xbt_dynar_t const dynar); * @{ */ -XBT_INLINE XBT_PUBLIC(void) xbt_dynar_cursor_rm(xbt_dynar_t dynar, +XBT_PUBLIC(void) xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int *const cursor); XBT_PUBLIC(void) xbt_dynar_cursor_unlock(xbt_dynar_t dynar); diff --git a/include/xbt/fifo.h b/include/xbt/fifo.h index 5455d697d9..9eeb67f3bb 100644 --- a/include/xbt/fifo.h +++ b/include/xbt/fifo.h @@ -53,10 +53,10 @@ XBT_PUBLIC(int) xbt_fifo_is_in(xbt_fifo_t, void *); * @{ */ -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_new_item(void); XBT_PUBLIC(void) xbt_fifo_set_item_content(xbt_fifo_item_t, void *); XBT_PUBLIC(void *) xbt_fifo_get_item_content(xbt_fifo_item_t); -XBT_INLINE XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_t); +XBT_PUBLIC(void) xbt_fifo_free_item(xbt_fifo_item_t); XBT_PUBLIC(void) xbt_fifo_push_item(xbt_fifo_t, xbt_fifo_item_t); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_pop_item(xbt_fifo_t); @@ -67,9 +67,9 @@ XBT_PUBLIC(int) xbt_fifo_remove(xbt_fifo_t, void *); XBT_PUBLIC(int) xbt_fifo_remove_all(xbt_fifo_t, void *); XBT_PUBLIC(void) xbt_fifo_remove_item(xbt_fifo_t, xbt_fifo_item_t); -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_first_item(xbt_fifo_t +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_first_item(xbt_fifo_t l); -XBT_INLINE XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_last_item(xbt_fifo_t +XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_last_item(xbt_fifo_t l); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_next_item(xbt_fifo_item_t i); XBT_PUBLIC(xbt_fifo_item_t) xbt_fifo_get_prev_item(xbt_fifo_item_t i); diff --git a/include/xbt/strbuff.h b/include/xbt/strbuff.h index 021de28377..1666655730 100644 --- a/include/xbt/strbuff.h +++ b/include/xbt/strbuff.h @@ -28,9 +28,9 @@ typedef struct { XBT_PUBLIC(void) xbt_strbuff_empty(xbt_strbuff_t b); XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new(void); -XBT_INLINE XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s); +XBT_PUBLIC(xbt_strbuff_t) xbt_strbuff_new_from(char *s); XBT_PUBLIC(void) xbt_strbuff_free(xbt_strbuff_t b); -XBT_INLINE XBT_PUBLIC(void) xbt_strbuff_free_container(xbt_strbuff_t b); +XBT_PUBLIC(void) xbt_strbuff_free_container(xbt_strbuff_t b); XBT_PUBLIC(void) xbt_strbuff_append(xbt_strbuff_t b, const char *toadd); XBT_PUBLIC(void) xbt_strbuff_chomp(xbt_strbuff_t b); XBT_PUBLIC(void) xbt_strbuff_trim(xbt_strbuff_t b); diff --git a/include/xbt/swag.h b/include/xbt/swag.h index 1407b52bb4..9ebd506420 100644 --- a/include/xbt/swag.h +++ b/include/xbt/swag.h @@ -88,7 +88,7 @@ typedef struct xbt_swag { XBT_PUBLIC(xbt_swag_t) xbt_swag_new(size_t offset); XBT_PUBLIC(void) xbt_swag_free(xbt_swag_t swag); -XBT_INLINE XBT_PUBLIC(void) xbt_swag_init(xbt_swag_t swag, size_t offset); +XBT_PUBLIC(void) xbt_swag_init(xbt_swag_t swag, size_t offset); /** * \param obj the objet to insert in the swag diff --git a/src/xbt/dict_cursor.c b/src/xbt/dict_cursor.c index 44f9f56492..7f401fadb6 100644 --- a/src/xbt/dict_cursor.c +++ b/src/xbt/dict_cursor.c @@ -67,7 +67,7 @@ static XBT_INLINE void __cursor_not_null(xbt_dict_cursor_t cursor) /** @brief Reinitialize the cursor. Mandatory after removal or add in dict. */ -XBT_INLINE void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) +void xbt_dict_cursor_rewind(xbt_dict_cursor_t cursor) { XBT_CDEBUG(xbt_dict_cursor, "xbt_dict_cursor_rewind"); xbt_assert(cursor); @@ -105,7 +105,7 @@ XBT_INLINE void xbt_dict_cursor_first(const xbt_dict_t dict, /** * \brief Move to the next element. */ -XBT_INLINE void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) +void xbt_dict_cursor_step(xbt_dict_cursor_t cursor) { xbt_dictelm_t current; int line; diff --git a/src/xbt/dynar.c b/src/xbt/dynar.c index b5468e3b9f..79333a95b7 100644 --- a/src/xbt/dynar.c +++ b/src/xbt/dynar.c @@ -307,7 +307,7 @@ void xbt_dynar_shrink(xbt_dynar_t dynar, int empty_slots_wanted) * kilkil a dynar and its content */ -XBT_INLINE void xbt_dynar_free(xbt_dynar_t * dynar) +void xbt_dynar_free(xbt_dynar_t * dynar) { if (dynar && *dynar) { xbt_dynar_reset(*dynar); @@ -326,7 +326,7 @@ void xbt_dynar_free_voidp(void *d) * * \param dynar the dynar we want to mesure */ -XBT_INLINE unsigned long xbt_dynar_length(const xbt_dynar_t dynar) +unsigned long xbt_dynar_length(const xbt_dynar_t dynar) { return (dynar ? (unsigned long) dynar->used : (unsigned long) 0); } @@ -336,7 +336,7 @@ XBT_INLINE unsigned long xbt_dynar_length(const xbt_dynar_t dynar) *\param dynar the dynat we want to check */ -XBT_INLINE int xbt_dynar_is_empty(const xbt_dynar_t dynar) +int xbt_dynar_is_empty(const xbt_dynar_t dynar) { return (xbt_dynar_length(dynar) == 0); } @@ -368,7 +368,7 @@ xbt_dynar_get_cpy(const xbt_dynar_t dynar, * \warning The returned value is the actual content of the dynar. * Make a copy before fooling with it. */ -XBT_INLINE void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, +void *xbt_dynar_get_ptr(const xbt_dynar_t dynar, const unsigned long idx) { @@ -604,7 +604,7 @@ XBT_INLINE void *xbt_dynar_push_ptr(xbt_dynar_t const dynar) } /** @brief Add an element at the end of the dynar */ -XBT_INLINE void xbt_dynar_push(xbt_dynar_t const dynar, +void xbt_dynar_push(xbt_dynar_t const dynar, const void *const src) { _dynar_lock(dynar); @@ -619,7 +619,7 @@ XBT_INLINE void xbt_dynar_push(xbt_dynar_t const dynar, * You can then use regular affectation to set its value instead of relying * on the slow memcpy. This is what xbt_dynar_pop_as() does. */ -XBT_INLINE void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar) +void *xbt_dynar_pop_ptr(xbt_dynar_t const dynar) { void *res; @@ -705,7 +705,7 @@ XBT_INLINE void xbt_dynar_map(const xbt_dynar_t dynar, * * This function can be used while traversing without problem. */ -XBT_INLINE void xbt_dynar_cursor_rm(xbt_dynar_t dynar, +void xbt_dynar_cursor_rm(xbt_dynar_t dynar, unsigned int *const cursor) { diff --git a/src/xbt/fifo.c b/src/xbt/fifo.c index 89ab25fa12..7db645ea05 100644 --- a/src/xbt/fifo.c +++ b/src/xbt/fifo.c @@ -389,7 +389,7 @@ static void fifo_item_mallocator_reset_f(void *item) /** Constructor * \return a new bucket */ -XBT_INLINE xbt_fifo_item_t xbt_fifo_new_item(void) +xbt_fifo_item_t xbt_fifo_new_item(void) { return xbt_mallocator_get(item_mallocator); } @@ -427,7 +427,7 @@ XBT_INLINE void *xbt_fifo_get_item_content(xbt_fifo_item_t i) * * Free the bucket but does not modifies the object (if any) that was stored in it. */ -XBT_INLINE void xbt_fifo_free_item(xbt_fifo_item_t b) +void xbt_fifo_free_item(xbt_fifo_item_t b) { xbt_mallocator_release(item_mallocator, b); return; @@ -456,7 +456,7 @@ XBT_INLINE int xbt_fifo_size(xbt_fifo_t f) * \param l a list * \return the head of \a l. */ -XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l) +xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l) { return l->head; } @@ -465,7 +465,7 @@ XBT_INLINE xbt_fifo_item_t xbt_fifo_get_first_item(xbt_fifo_t l) * \param l a list * \return the tail of \a l. */ -XBT_INLINE xbt_fifo_item_t xbt_fifo_get_last_item(xbt_fifo_t l) +xbt_fifo_item_t xbt_fifo_get_last_item(xbt_fifo_t l) { return l->tail; } diff --git a/src/xbt/swag.c b/src/xbt/swag.c index d64067f22e..0c04ba9713 100644 --- a/src/xbt/swag.c +++ b/src/xbt/swag.c @@ -48,7 +48,7 @@ XBT_INLINE void xbt_swag_free(xbt_swag_t swag) * * Usage : xbt_swag_init(swag,&obj.setA-&obj); */ -XBT_INLINE void xbt_swag_init(xbt_swag_t swag, size_t offset) +void xbt_swag_init(xbt_swag_t swag, size_t offset) { swag->tail = NULL; swag->head = NULL; diff --git a/src/xbt/xbt_strbuff.c b/src/xbt/xbt_strbuff.c index 6f470ed7cc..abf0a0d690 100644 --- a/src/xbt/xbt_strbuff.c +++ b/src/xbt/xbt_strbuff.c @@ -23,7 +23,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(strbuff, xbt, "String buffers"); ** Buffer code **/ -XBT_INLINE void xbt_strbuff_empty(xbt_strbuff_t b) +void xbt_strbuff_empty(xbt_strbuff_t b) { b->used = 0; b->data[0] = '\n'; @@ -43,7 +43,7 @@ xbt_strbuff_t xbt_strbuff_new(void) * * Beware, we store the ctn directly, not a copy of it */ -XBT_INLINE xbt_strbuff_t xbt_strbuff_new_from(char *ctn) +xbt_strbuff_t xbt_strbuff_new_from(char *ctn) { xbt_strbuff_t res = malloc(sizeof(s_xbt_strbuff_t)); res->data = ctn; @@ -52,13 +52,13 @@ XBT_INLINE xbt_strbuff_t xbt_strbuff_new_from(char *ctn) } /** @brief frees only the container without touching to the contained string */ -XBT_INLINE void xbt_strbuff_free_container(xbt_strbuff_t b) +void xbt_strbuff_free_container(xbt_strbuff_t b) { free(b); } /** @brief frees the buffer and its content */ -XBT_INLINE void xbt_strbuff_free(xbt_strbuff_t b) +void xbt_strbuff_free(xbt_strbuff_t b) { if (b) { if (b->data) @@ -87,7 +87,7 @@ void xbt_strbuff_append(xbt_strbuff_t b, const char *toadd) b->used += addlen; } -XBT_INLINE void xbt_strbuff_chomp(xbt_strbuff_t b) +void xbt_strbuff_chomp(xbt_strbuff_t b) { while (b->data[b->used] == '\n') { b->data[b->used] = '\0'; @@ -96,7 +96,7 @@ XBT_INLINE void xbt_strbuff_chomp(xbt_strbuff_t b) } } -XBT_INLINE void xbt_strbuff_trim(xbt_strbuff_t b) +void xbt_strbuff_trim(xbt_strbuff_t b) { xbt_str_trim(b->data, " "); b->used = strlen(b->data);