Mercurial > hg > ucx / file diff

--- a/src/compare.c	Sat Dec 28 15:06:15 2024 +0100
+++ b/src/compare.c	Sat Dec 28 17:31:28 2024 +0100
@@ -30,9 +30,21 @@
 
 #include <math.h>
 
+int cx_vcmp_int(int a, int b) {
+    if (a == b) {
+        return 0;
+    } else {
+        return a < b ? -1 : 1;
+    }
+}
+
 int cx_cmp_int(const void *i1, const void *i2) {
     int a = *((const int *) i1);
     int b = *((const int *) i2);
+    return cx_vcmp_int(a, b);
+}
+
+int cx_vcmp_longint(long int a, long int b) {
     if (a == b) {
         return 0;
     } else {
@@ -43,6 +55,10 @@
 int cx_cmp_longint(const void *i1, const void *i2) {
     long int a = *((const long int *) i1);
     long int b = *((const long int *) i2);
+    return cx_vcmp_longint(a, b);
+}
+
+int cx_vcmp_longlong(long long a, long long b) {
     if (a == b) {
         return 0;
     } else {
@@ -53,6 +69,10 @@
 int cx_cmp_longlong(const void *i1, const void *i2) {
     long long a = *((const long long *) i1);
     long long b = *((const long long *) i2);
+    return cx_vcmp_longlong(a, b);
+}
+
+int cx_vcmp_int16(int16_t a, int16_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -63,6 +83,10 @@
 int cx_cmp_int16(const void *i1, const void *i2) {
     int16_t a = *((const int16_t *) i1);
     int16_t b = *((const int16_t *) i2);
+    return cx_vcmp_int16(a, b);
+}
+
+int cx_vcmp_int32(int32_t a, int32_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -73,6 +97,10 @@
 int cx_cmp_int32(const void *i1, const void *i2) {
     int32_t a = *((const int32_t *) i1);
     int32_t b = *((const int32_t *) i2);
+    return cx_vcmp_int32(a, b);
+}
+
+int cx_vcmp_int64(int64_t a, int64_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -83,6 +111,10 @@
 int cx_cmp_int64(const void *i1, const void *i2) {
     int64_t a = *((const int64_t *) i1);
     int64_t b = *((const int64_t *) i2);
+    return cx_vcmp_int64(a, b);
+}
+
+int cx_vcmp_uint(unsigned int a, unsigned int b) {
     if (a == b) {
         return 0;
     } else {
@@ -93,6 +125,10 @@
 int cx_cmp_uint(const void *i1, const void *i2) {
     unsigned int a = *((const unsigned int *) i1);
     unsigned int b = *((const unsigned int *) i2);
+    return cx_vcmp_uint(a, b);
+}
+
+int cx_vcmp_ulongint(unsigned long int a, unsigned long int b) {
     if (a == b) {
         return 0;
     } else {
@@ -103,6 +139,10 @@
 int cx_cmp_ulongint(const void *i1, const void *i2) {
     unsigned long int a = *((const unsigned long int *) i1);
     unsigned long int b = *((const unsigned long int *) i2);
+    return cx_vcmp_ulongint(a, b);
+}
+
+int cx_vcmp_ulonglong(unsigned long long a, unsigned long long b) {
     if (a == b) {
         return 0;
     } else {
@@ -113,6 +153,10 @@
 int cx_cmp_ulonglong(const void *i1, const void *i2) {
     unsigned long long a = *((const unsigned long long *) i1);
     unsigned long long b = *((const unsigned long long *) i2);
+    return cx_vcmp_ulonglong(a, b);
+}
+
+int cx_vcmp_uint16(uint16_t a, uint16_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -123,6 +167,10 @@
 int cx_cmp_uint16(const void *i1, const void *i2) {
     uint16_t a = *((const uint16_t *) i1);
     uint16_t b = *((const uint16_t *) i2);
+    return cx_vcmp_uint16(a, b);
+}
+
+int cx_vcmp_uint32(uint32_t a, uint32_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -133,6 +181,10 @@
 int cx_cmp_uint32(const void *i1, const void *i2) {
     uint32_t a = *((const uint32_t *) i1);
     uint32_t b = *((const uint32_t *) i2);
+    return cx_vcmp_uint32(a, b);
+}
+
+int cx_vcmp_uint64(uint64_t a, uint64_t b) {
     if (a == b) {
         return 0;
     } else {
@@ -143,7 +195,11 @@
 int cx_cmp_uint64(const void *i1, const void *i2) {
     uint64_t a = *((const uint64_t *) i1);
     uint64_t b = *((const uint64_t *) i2);
-    if (a == b) {
+    return cx_vcmp_uint64(a, b);
+}
+
+int cx_vcmp_float(float a, float b) {
+    if (fabsf(a - b) < 1e-6f) {
         return 0;
     } else {
         return a < b ? -1 : 1;
@@ -153,7 +209,11 @@
 int cx_cmp_float(const void *f1, const void *f2) {
     float a = *((const float *) f1);
     float b = *((const float *) f2);
-    if (fabsf(a - b) < 1e-6f) {
+    return cx_vcmp_float(a, b);
+}
+
+int cx_vcmp_double(double a, double b) {
+    if (fabs(a - b) < 1e-14) {
         return 0;
     } else {
         return a < b ? -1 : 1;
@@ -166,10 +226,14 @@
 ) {
     double a = *((const double *) d1);
     double b = *((const double *) d2);
-    if (fabs(a - b) < 1e-14) {
+    return cx_vcmp_double(a, b);
+}
+
+int cx_vcmp_intptr(intptr_t p1, intptr_t p2) {
+    if (p1 == p2) {
         return 0;
     } else {
-        return a < b ? -1 : 1;
+        return p1 < p2 ? -1 : 1;
     }
 }
 
@@ -179,6 +243,10 @@
 ) {
     intptr_t p1 = *(const intptr_t *) ptr1;
     intptr_t p2 = *(const intptr_t *) ptr2;
+    return cx_vcmp_intptr(p1, p2);
+}
+
+int cx_vcmp_uintptr(uintptr_t p1, uintptr_t p2) {
     if (p1 == p2) {
         return 0;
     } else {
@@ -192,11 +260,7 @@
 ) {
     uintptr_t p1 = *(const uintptr_t *) ptr1;
     uintptr_t p2 = *(const uintptr_t *) ptr2;
-    if (p1 == p2) {
-        return 0;
-    } else {
-        return p1 < p2 ? -1 : 1;
-    }
+    return cx_vcmp_uintptr(p1, p2);
 }
 
 int cx_cmp_ptr(