Optimize commit 331cc3f079

Reorder to minimize comparisons
This commit is contained in:
James Cloos 2008-07-23 13:17:33 -04:00
parent b699364b1c
commit ab6557fcd4

View File

@ -1590,19 +1590,17 @@ OsLookupColor(int screen,
mid = (low + high) / 2; mid = (low + high) / 2;
c = &BuiltinColors[mid]; c = &BuiltinColors[mid];
r = strncasecmp (&BuiltinColorNames[c->name], name, len); r = strncasecmp (&BuiltinColorNames[c->name], name, len);
if (r == 0 && strlen (&BuiltinColorNames[c->name]) > len) if (r == 0 && len == strlen (&BuiltinColorNames[c->name]))
r++;
if (r == 0)
{ {
*pred = c->red * 0x101; *pred = c->red * 0x101;
*pgreen = c->green * 0x101; *pgreen = c->green * 0x101;
*pblue = c->blue * 0x101; *pblue = c->blue * 0x101;
return TRUE; return TRUE;
} }
if (r > 0) if (r < 0)
high = mid - 1;
else
low = mid + 1; low = mid + 1;
else
high = mid - 1;
} }
return FALSE; return FALSE;
} }