nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 01:48:00 +00:00
Code Issues Projects Releases Wiki Activity

Partially revert r9636. It is true that we can directly return the

Browse Source 
result of memcmp, but untrue that we can do so _unconditionally_: if
memcmp returns zero, we still need to fall through to the next
comparison.

[originally from svn r9637]
[r9636 == 538090ede4]
This commit is contained in:
Simon Tatham 2012-08-28 17:41:10 +00:00
parent 538090ede4
commit 03ebc74b9f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
timing.c
View File

@ -62,7 +62,11 @@ static int compare_timers(void *av, void *bv)
*/ */
#if defined(__LCC__) || defined(__clang__) #if defined(__LCC__) || defined(__clang__)
/* lcc won't let us compare function pointers. Legal, but annoying. */ /* lcc won't let us compare function pointers. Legal, but annoying. */
return memcmp(&a->fn, &b->fn, sizeof(a->fn)); {
int c = memcmp(&a->fn, &b->fn, sizeof(a->fn));
if (c)
return c;
}
#else #else
if (a->fn < b->fn) if (a->fn < b->fn)
return -1; return -1;