refactor: don't use subtraction in qsort() comparison functions

This commit is contained in:
zeertzjq
2024-02-10 21:38:48 +08:00
parent f3982ad3f3
commit 00e785b17f
6 changed files with 36 additions and 17 deletions

View File

@@ -172,20 +172,28 @@ int sign_cmp(const void *p1, const void *p2)
{
const MTKey *s1 = (MTKey *)p1;
const MTKey *s2 = (MTKey *)p2;
int n = s1->pos.row - s2->pos.row;
if (n) {
return n;
if (s1->pos.row != s2->pos.row) {
return s1->pos.row > s2->pos.row ? 1 : -1;
}
DecorSignHighlight *sh1 = decor_find_sign(mt_decor(*s1));
DecorSignHighlight *sh2 = decor_find_sign(mt_decor(*s2));
assert(sh1 && sh2);
n = sh2->priority - sh1->priority;
if (sh1->priority != sh2->priority) {
return sh1->priority < sh2->priority ? 1 : -1;
}
return n ? n : (n = (int)(s2->id - s1->id))
? n : (sh2->sign_add_id - sh1->sign_add_id);
if (s1->id != s2->id) {
return s1->id < s2->id ? 1 : -1;
}
if (sh1->sign_add_id != sh2->sign_add_id) {
return sh1->sign_add_id < sh2->sign_add_id ? 1 : -1;
}
return 0;
}
/// Delete the specified sign(s)