fixup! secp memcmp and spacing

Author: jonasnick

src/hsort_impl.h

@@ -101,13 +101,13 @@ static SECP256K1_INLINE void secp256k1_heap_down(unsigned char *arr, size_t i, s
 /* In-place heap sort. */
 static void secp256k1_hsort(void *ptr, size_t count, size_t size,
                             int (*cmp)(const void *, const void *, void *),
-                            void *cmp_data ) {
+                            void *cmp_data) {
     size_t i;
 
-    for(i = count/2; 0 < i; --i) {
+    for (i = count/2; 0 < i; --i) {
         secp256k1_heap_down(ptr, i-1, count, size, cmp, cmp_data);
     }
-    for(i = count; 1 < i; --i) {
+    for (i = count; 1 < i; --i) {
         /* Extract the largest value from the heap */
         secp256k1_heap_swap(ptr, 0, i-1, size);
 

src/tests.c

@@ -3693,7 +3693,7 @@ static void test_heap_swap(void) {
 static void test_hsort_is_sorted(unsigned char *elements, size_t n, size_t len) {
     size_t i;
     for (i = 1; i < n; i++) {
-        CHECK(memcmp(&elements[(i-1) * len], &elements[i * len], len) <= 0);
+        CHECK(secp256k1_memcmp_var(&elements[(i-1) * len], &elements[i * len], len) <= 0);
     }
 }
 
@@ -3702,10 +3702,11 @@ struct test_hsort_cmp_data {
     size_t element_len;
 };
 
+
 static int test_hsort_cmp(const void *ele1, const void *ele2, void *data) {
   struct test_hsort_cmp_data *d = (struct test_hsort_cmp_data *) data;
-  d->counter += 1;
-  return memcmp((unsigned char *)ele1, (unsigned char *)ele2, d->element_len);
+    d->counter += 1;
+    return secp256k1_memcmp_var((unsigned char *)ele1, (unsigned char *)ele2, d->element_len);
 }
 
 #define NUM 65