AuroraMiddleware/harfbuzz
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[name] Minor, use subtraction instead ternary operator

Browse Source 
Guess ternary was a bit more legible, apparently however we agreed to use subtraction,
https://github.com/harfbuzz/harfbuzz/pull/2139#discussion_r372582005
This commit is contained in:
Ebrahim Byagowi 2020-02-01 23:16:26 +03:30
parent 490ef1cc23
commit b2a68ed587
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hb-ot-name-table.hh
View File

@ -112,30 +112,30 @@ struct NameRecord
{ {
unsigned int p = platformID; unsigned int p = platformID;
unsigned int e = encodingID; unsigned int e = encodingID;
return (p == 0 || return (p == 0 ||
(p == 3 && (e == 0 || e == 1 || e == 10))); (p == 3 && (e == 0 || e == 1 || e == 10)));
} }
static int cmp (const void *pa, const void *pb) static int cmp (const void *pa, const void *pb)
{ {
const NameRecord *a = (const NameRecord *)pa; const NameRecord *a = (const NameRecord *)pa;
const NameRecord *b = (const NameRecord *)pb; const NameRecord *b = (const NameRecord *)pb;
if (a->platformID != b->platformID) if (a->platformID != b->platformID)
return a->platformID < b->platformID ? -1 : +1; return a->platformID - b->platformID;
if (a->encodingID != b->encodingID) if (a->encodingID != b->encodingID)
return a->encodingID < b->encodingID ? -1 : +1; return a->encodingID - b->encodingID;
if (a->languageID != b->languageID) if (a->languageID != b->languageID)
return a->languageID < b->languageID ? -1 : +1; return a->languageID - b->languageID;
if (a->nameID != b->nameID) if (a->nameID != b->nameID)
return a->nameID < b->nameID ? -1 : +1; return a->nameID - b->nameID;
if (a->length != b->length) if (a->length != b->length)
return a->length < b->length ? -1 : +1; return a->length - b->length;
return 0; return 0;
} }
@ -166,7 +166,7 @@ _hb_ot_name_entry_cmp_key (const void *pa, const void *pb)
/* Compare by name_id, then language. */ /* Compare by name_id, then language. */
if (a->name_id != b->name_id) if (a->name_id != b->name_id)
return a->name_id < b->name_id ? -1 : +1; return a->name_id - b->name_id;
if (a->language == b->language) return 0; if (a->language == b->language) return 0;
if (!a->language) return -1; if (!a->language) return -1;
@ -188,10 +188,10 @@ _hb_ot_name_entry_cmp (const void *pa, const void *pb)
const hb_ot_name_entry_t *b = (const hb_ot_name_entry_t *) pb; const hb_ot_name_entry_t *b = (const hb_ot_name_entry_t *) pb;
if (a->entry_score != b->entry_score) if (a->entry_score != b->entry_score)
return a->entry_score < b->entry_score ? -1 : +1; return a->entry_score - b->entry_score;
if (a->entry_index != b->entry_index) if (a->entry_index != b->entry_index)
return a->entry_index < b->entry_index ? -1 : +1; return a->entry_index - b->entry_index;
return 0; return 0;
} }