--- a/src/ucx/utils.c Tue Aug 13 22:14:32 2019 +0200
+++ b/src/ucx/utils.c Sat Sep 24 16:26:10 2022 +0200
@@ -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,22 +26,23 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-#include "utils.h"
+#include "ucx/utils.h"
+
#include <math.h>
#include <stdio.h>
#include <limits.h>
#include <errno.h>
/* COPY FUCNTIONS */
-void* ucx_strcpy(void* s, void* data) {
- char *str = (char*) s;
+void* ucx_strcpy(const void* s, void* data) {
+ const char *str = (const char*) s;
size_t n = 1+strlen(str);
char *cpy = (char*) malloc(n);
memcpy(cpy, str, n);
return cpy;
}
-void* ucx_memcpy(void* m, void* n) {
+void* ucx_memcpy(const void* m, void* n) {
size_t k = *((size_t*)n);
void *cpy = malloc(k);
memcpy(cpy, m, k);
@@ -87,17 +88,103 @@
/* COMPARE FUNCTIONS */
-int ucx_strcmp(void *s1, void *s2, void *data) {
- return strcmp((char*)s1, (char*)s2);
+int ucx_cmp_str(const void *s1, const void *s2, void *data) {
+ return strcmp((const char*)s1, (const char*)s2);
+}
+
+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_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) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_longint(const void *i1, const void *i2, void *data) {
+ long int a = *((const long int*) i1);
+ long int b = *((const long int*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_longlong(const void *i1, const void *i2, void *data) {
+ long long a = *((const long long*) i1);
+ long long b = *((const long long*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
}
-int ucx_strncmp(void *s1, void *s2, void *n) {
- return strncmp((char*)s1, (char*)s2, *((size_t*) n));
+int ucx_cmp_int16(const void *i1, const void *i2, void *data) {
+ int16_t a = *((const int16_t*) i1);
+ int16_t b = *((const int16_t*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_int32(const void *i1, const void *i2, void *data) {
+ int32_t a = *((const int32_t*) i1);
+ int32_t b = *((const int32_t*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
}
-int ucx_intcmp(void *i1, void *i2, void *data) {
- int a = *((int*) i1);
- int b = *((int*) i2);
+int ucx_cmp_int64(const void *i1, const void *i2, void *data) {
+ int64_t a = *((const int64_t*) i1);
+ int64_t b = *((const int64_t*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_uint(const void *i1, const void *i2, void *data) {
+ unsigned int a = *((const unsigned int*) i1);
+ unsigned int b = *((const unsigned int*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_ulongint(const void *i1, const void *i2, void *data) {
+ unsigned long int a = *((const unsigned long int*) i1);
+ unsigned long int b = *((const unsigned long int*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_ulonglong(const void *i1, const void *i2, void *data) {
+ unsigned long long a = *((const unsigned long long*) i1);
+ unsigned long long b = *((const unsigned long long*) i2);
if (a == b) {
return 0;
} else {
@@ -105,9 +192,111 @@
}
}
-int ucx_floatcmp(void *f1, void *f2, void *epsilon) {
- float a = *((float*) f1);
- float b = *((float*) f2);
+int ucx_cmp_uint16(const void *i1, const void *i2, void *data) {
+ uint16_t a = *((const uint16_t*) i1);
+ uint16_t b = *((const uint16_t*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_uint32(const void *i1, const void *i2, void *data) {
+ uint32_t a = *((const uint32_t*) i1);
+ uint32_t b = *((const uint32_t*) i2);
+ if (a == b) {
+ return 0;
+ } else {
+ return a < b ? -1 : 1;
+ }
+}
+
+int ucx_cmp_uint64(const void *i1, const void *i2, void *data) {
+ uint64_t a = *((const uint64_t*) i1);
+ uint64_t b = *((const uint64_t*) 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;
+}
+
+intmax_t ucx_dist_longlong(const void *i1, const void *i2, void *data) {
+ intmax_t a = *((const long long*) i1);
+ intmax_t b = *((const long long*) i2);
+ return a - b;
+}
+
+intmax_t ucx_dist_int16(const void *i1, const void *i2, void *data) {
+ intmax_t a = *((const int16_t*) i1);
+ intmax_t b = *((const int16_t*) i2);
+ return a - b;
+}
+
+intmax_t ucx_dist_int32(const void *i1, const void *i2, void *data) {
+ intmax_t a = *((const int32_t*) i1);
+ intmax_t b = *((const int32_t*) i2);
+ return a - b;
+}
+
+intmax_t ucx_dist_int64(const void *i1, const void *i2, void *data) {
+ intmax_t a = *((const int64_t*) i1);
+ intmax_t b = *((const int64_t*) i2);
+ return a - b;
+}
+
+intmax_t ucx_dist_uint(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const unsigned int*) i1);
+ uintmax_t b = *((const unsigned int*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+intmax_t ucx_dist_ulongint(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const unsigned long int*) i1);
+ uintmax_t b = *((const unsigned long int*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+intmax_t ucx_dist_ulonglong(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const unsigned long long*) i1);
+ uintmax_t b = *((const unsigned long long*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+intmax_t ucx_dist_uint16(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const uint16_t*) i1);
+ uintmax_t b = *((const uint16_t*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+intmax_t ucx_dist_uint32(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const uint32_t*) i1);
+ uintmax_t b = *((const uint32_t*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+intmax_t ucx_dist_uint64(const void *i1, const void *i2, void *data) {
+ uintmax_t a = *((const uint64_t*) i1);
+ uintmax_t b = *((const uint64_t*) i2);
+ return a > b ? (intmax_t)(a - b) : -(intmax_t)(b - a);
+}
+
+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);
if (fabsf(a - b) < e) {
return 0;
@@ -116,9 +305,9 @@
}
}
-int ucx_doublecmp(void *d1, void *d2, void *epsilon) {
- double a = *((float*) d1);
- double b = *((float*) d2);
+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);
if (fabs(a - b) < e) {
return 0;
@@ -127,9 +316,9 @@
}
}
-int ucx_ptrcmp(void *ptr1, void *ptr2, void *data) {
- intptr_t p1 = (intptr_t) ptr1;
- intptr_t p2 = (intptr_t) ptr2;
+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) {
return 0;
} else {
@@ -137,7 +326,7 @@
}
}
-int ucx_memcmp(void *ptr1, void *ptr2, void *n) {
+int ucx_cmp_mem(const void *ptr1, const void *ptr2, void *n) {
return memcmp(ptr1, ptr2, *((size_t*)n));
}
