diff -r 62f1a55535e7 -r 0b33b9396851 ucx/utils.c
--- a/ucx/utils.c	Mon Feb 04 14:46:11 2019 +0100
+++ b/ucx/utils.c	Mon Feb 04 17:49:50 2019 +0100
@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright 2016 Olaf Wintermann. All rights reserved.
+ * Copyright 2017 Mike Becker, Olaf Wintermann All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -26,7 +26,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "utils.h"
+#include "ucx/utils.h"
+
 #include <math.h>
 #include <stdio.h>
 #include <limits.h>
@@ -87,15 +88,21 @@
 
 /* COMPARE FUNCTIONS */
 
-int ucx_strcmp(const void *s1, const void *s2, void *data) {
+int ucx_cmp_str(const void *s1, const void *s2, void *data) {
     return strcmp((const char*)s1, (const char*)s2);
 }
 
-int ucx_strncmp(const void *s1, const void *s2, void *n) {
+int ucx_cmp_strn(const void *s1, const void *s2, void *n) {
     return strncmp((const char*)s1, (const char*)s2, *((size_t*) n));
 }
 
-int ucx_intcmp(const void *i1, const void *i2, void *data) {
+int ucx_cmp_sstr(const void *s1, const void *s2, void *data) {
+    sstr_t a = *(const sstr_t*) s1;
+    sstr_t b = *(const sstr_t*) s2;
+    return sstrcmp(a, b);
+}
+
+int ucx_cmp_int(const void *i1, const void *i2, void *data) {
    int a = *((const int*) i1);
    int b = *((const int*) i2);
    if (a == b) {
@@ -105,7 +112,29 @@
    }
 }
 
-int ucx_floatcmp(const void *f1, const void *f2, void *epsilon) {
+int ucx_cmp_longint(const void *i1, const void *i2, void *data) {
+   int a = *((const long int*) i1);
+   int b = *((const long int*) i2);
+   if (a == b) {
+       return 0;
+   } else {
+       return a < b ? -1 : 1;
+   }
+}
+
+intmax_t ucx_dist_int(const void *i1, const void *i2, void *data) {
+   intmax_t a = *((const int*) i1);
+   intmax_t b = *((const int*) i2);
+   return a - b;
+}
+
+intmax_t ucx_dist_longint(const void *i1, const void *i2, void *data) {
+   intmax_t a = *((const long int*) i1);
+   intmax_t b = *((const long int*) i2);
+   return a - b;
+}
+
+int ucx_cmp_float(const void *f1, const void *f2, void *epsilon) {
    float a = *((const float*) f1);
    float b = *((const float*) f2);
    float e = !epsilon ? 1e-6f : *((float*)epsilon);
@@ -116,7 +145,7 @@
    }
 }
 
-int ucx_doublecmp(const void *d1, const void *d2, void *epsilon) {
+int ucx_cmp_double(const void *d1, const void *d2, void *epsilon) {
    double a = *((const double*) d1);
    double b = *((const double*) d2);
    double e = !epsilon ? 1e-14 : *((double*)epsilon);
@@ -127,7 +156,7 @@
    }
 }
 
-int ucx_ptrcmp(const void *ptr1, const void *ptr2, void *data) {
+int ucx_cmp_ptr(const void *ptr1, const void *ptr2, void *data) {
     const intptr_t p1 = (const intptr_t) ptr1;
     const intptr_t p2 = (const intptr_t) ptr2;
     if (p1 == p2) {
@@ -137,7 +166,7 @@
     }
 }
 
-int ucx_memcmp(const void *ptr1, const void *ptr2, void *n) {
+int ucx_cmp_mem(const void *ptr1, const void *ptr2, void *n) {
     return memcmp(ptr1, ptr2, *((size_t*)n));
 }