Simplify compar_int() and compar_special_int()

ikspress · ikspress · commit 2a2d056a82a2 · 2024-06-13T08:42:33.000+08:00
diff --git a/src/mfoc.c b/src/mfoc.c
@@ -1198,15 +1198,15 @@ uint32_t median(denonce d)
 
 int compar_int(const void *a, const void *b)
 {
-    if (*(uint64_t *)b == *(uint64_t *)a) return 0;
-    if (*(uint64_t *)b < * (uint64_t *)a) return 1;
-    return -1;
+  uint64_t m = *(uint64_t *)a, n = *(uint64_t *)b;
+  return (m > n) - (m < n);
 }
 
 // Compare countKeys structure
 int compar_special_int(const void *a, const void *b)
 {
-  return (((countKeys *)b)->count - ((countKeys *)a)->count);
+  int m = ((countKeys *)a)->count, n = ((countKeys *)b)->count;
+  return (m > n) - (m < n);
 }
 
 countKeys *uniqsort(uint64_t *possibleKeys, uint32_t size)

Original file line number	Diff line number	Diff line change
`@@ -1198,15 +1198,15 @@ uint32_t median(denonce d)`
`1198`	`1198`
`1199`	`1199`	`int compar_int(const void a, const void b)`
`1200`	`1200`	`{`
`1201`		`- if ((uint64_t )b == (uint64_t )a) return 0;`
`1202`		`- if ((uint64_t )b < * (uint64_t *)a) return 1;`
`1203`		`- return -1;`
	`1201`	`+ uint64_t m = (uint64_t )a, n = (uint64_t )b;`
	`1202`	`+ return (m > n) - (m < n);`
`1204`	`1203`	`}`
`1205`	`1204`
`1206`	`1205`	`// Compare countKeys structure`
`1207`	`1206`	`int compar_special_int(const void a, const void b)`
`1208`	`1207`	`{`
`1209`		`- return (((countKeys )b)->count - ((countKeys )a)->count);`
	`1208`	`+ int m = ((countKeys )a)->count, n = ((countKeys )b)->count;`
	`1209`	`+ return (m > n) - (m < n);`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`	`1212`	`countKeys uniqsort(uint64_t possibleKeys, uint32_t size)`