From: Arnaud Giersch Date: Fri, 28 Jun 2019 07:46:43 +0000 (+0200) Subject: Drop xbt_dynar_sort_strings(). X-Git-Tag: v3.23.2~49 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/1830ec873b286ded8981e8fb3327715d1e6a737f?ds=sidebyside Drop xbt_dynar_sort_strings(). --- diff --git a/ChangeLog b/ChangeLog index a0eaf8dca7..6c43d5f1a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,10 @@ SimGrid (3.23.1) NOT RELEASED YET (v3.24 expected September 23. 7:50 UTC) Documentation: - Nicer introduction page. - Move Java as a subtree of MSG. - + +XBT: + - Drop xbt_dynar_sort_strings(). + Bugs: - Really fix FG#26: Turning off a link should raise NetworkFailureException diff --git a/include/xbt/dynar.h b/include/xbt/dynar.h index c22b219bcd..b7529f34b1 100644 --- a/include/xbt/dynar.h +++ b/include/xbt/dynar.h @@ -92,7 +92,6 @@ XBT_PUBLIC unsigned int xbt_dynar_search(xbt_dynar_t const dynar, void* elem); XBT_PUBLIC signed int xbt_dynar_search_or_negative(xbt_dynar_t const dynar, void* const elem); XBT_PUBLIC int xbt_dynar_member(xbt_dynar_t const dynar, void* elem); XBT_PUBLIC void xbt_dynar_sort(xbt_dynar_t const dynar, int_f_cpvoid_cpvoid_t compar_fn); -XBT_PUBLIC xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar); XBT_PUBLIC int xbt_dynar_compare(xbt_dynar_t d1, xbt_dynar_t d2, int (*compar)(const void*, const void*)); XBT_PUBLIC void* xbt_dynar_to_array(xbt_dynar_t dynar); diff --git a/src/xbt/dynar.cpp b/src/xbt/dynar.cpp index 6b9a73981d..2670fc5bc5 100644 --- a/src/xbt/dynar.cpp +++ b/src/xbt/dynar.cpp @@ -602,17 +602,6 @@ void xbt_dynar_sort(xbt_dynar_t dynar, int_f_cpvoid_cpvoid_t compar_fn) qsort(dynar->data, dynar->used, dynar->elmsize, compar_fn); } -static int strcmp_voidp(const void *pa, const void *pb) { - return strcmp(*(const char **)pa, *(const char **)pb); -} - -/** @brief Sorts a dynar of strings (ie, char* data) */ -xbt_dynar_t xbt_dynar_sort_strings(xbt_dynar_t dynar) -{ - xbt_dynar_sort(dynar, strcmp_voidp); - return dynar; // to enable functional uses -} - /** @brief Transform a dynar into a nullptr terminated array. * * @param dynar the dynar to transform