Mercurial > hg > ucx / changeset

     1.1 --- a/docs/src/modules.md	Mon May 14 18:23:35 2018 +0200
     1.2 +++ b/docs/src/modules.md	Mon May 14 18:25:20 2018 +0200
     1.3 @@ -69,7 +69,7 @@
     1.4   * Source code
     1.5   */
     1.6  
     1.7 -UcxAVLTree* tree = ucx_avl_new(ucx_longintcmp);
     1.8 +UcxAVLTree* tree = ucx_avl_new(ucx_cmp_longint);
     1.9  /* ... populate tree with objects, use '& MyObject.ts' as key ... */
    1.10  
    1.11  
    1.12 @@ -81,7 +81,7 @@
    1.13  for (
    1.14          UcxAVLNode* node = ucx_avl_find_node(
    1.15              tree, (intptr_t) &ts_start,
    1.16 -            ucx_longintdist, UCX_AVL_FIND_LOWER_BOUNDED);
    1.17 +            ucx_dist_longint, UCX_AVL_FIND_LOWER_BOUNDED);
    1.18          node && (*(time_t*)node->key) <= ts_end;
    1.19          node = ucx_avl_succ(node)
    1.20      ) {

     2.1 --- a/src/ucx/utils.h	Mon May 14 18:23:35 2018 +0200
     2.2 +++ b/src/ucx/utils.h	Mon May 14 18:25:20 2018 +0200
     2.3 @@ -172,7 +172,7 @@
     2.4   * @return -1, if *i1 is less than *i2, 0 if both are equal,
     2.5   * 1 if *i1 is greater than *i2
     2.6   */
     2.7 -int ucx_intcmp(const void *i1, const void *i2, void *data);
     2.8 +int ucx_cmp_int(const void *i1, const void *i2, void *data);
     2.9  
    2.10  /**
    2.11   * Compares two integers of type long int.
    2.12 @@ -182,7 +182,7 @@
    2.13   * @return -1, if *i1 is less than *i2, 0 if both are equal,
    2.14   * 1 if *i1 is greater than *i2
    2.15   */
    2.16 -int ucx_longintcmp(const void *i1, const void *i2, void *data);
    2.17 +int ucx_cmp_longint(const void *i1, const void *i2, void *data);
    2.18  
    2.19  
    2.20  /**
    2.21 @@ -192,7 +192,7 @@
    2.22   * @param data omitted
    2.23   * @return i1 minus i2
    2.24   */
    2.25 -intmax_t ucx_intdist(const void *i1, const void *i2, void *data);
    2.26 +intmax_t ucx_dist_int(const void *i1, const void *i2, void *data);
    2.27  
    2.28  /**
    2.29   * Distance function for integers of type long int.
    2.30 @@ -201,7 +201,7 @@
    2.31   * @param data omitted
    2.32   * @return i1 minus i2
    2.33   */
    2.34 -intmax_t ucx_longintdist(const void *i1, const void *i2, void *data);
    2.35 +intmax_t ucx_dist_longint(const void *i1, const void *i2, void *data);
    2.36  
    2.37  /**
    2.38   * Compares two real numbers of type float.

     3.1 --- a/src/utils.c	Mon May 14 18:23:35 2018 +0200
     3.2 +++ b/src/utils.c	Mon May 14 18:25:20 2018 +0200
     3.3 @@ -102,7 +102,7 @@
     3.4      return sstrcmp(a, b);
     3.5  }
     3.6  
     3.7 -int ucx_intcmp(const void *i1, const void *i2, void *data) {
     3.8 +int ucx_cmp_int(const void *i1, const void *i2, void *data) {
     3.9     int a = *((const int*) i1);
    3.10     int b = *((const int*) i2);
    3.11     if (a == b) {
    3.12 @@ -112,7 +112,7 @@
    3.13     }
    3.14  }
    3.15  
    3.16 -int ucx_longintcmp(const void *i1, const void *i2, void *data) {
    3.17 +int ucx_cmp_longint(const void *i1, const void *i2, void *data) {
    3.18     int a = *((const long int*) i1);
    3.19     int b = *((const long int*) i2);
    3.20     if (a == b) {
    3.21 @@ -122,13 +122,13 @@
    3.22     }
    3.23  }
    3.24  
    3.25 -intmax_t ucx_intdist(const void *i1, const void *i2, void *data) {
    3.26 +intmax_t ucx_dist_int(const void *i1, const void *i2, void *data) {
    3.27     intmax_t a = *((const int*) i1);
    3.28     intmax_t b = *((const int*) i2);
    3.29     return a - b;
    3.30  }
    3.31  
    3.32 -intmax_t ucx_longintdist(const void *i1, const void *i2, void *data) {
    3.33 +intmax_t ucx_dist_longint(const void *i1, const void *i2, void *data) {
    3.34     intmax_t a = *((const long int*) i1);
    3.35     intmax_t b = *((const long int*) i2);
    3.36     return a - b;