emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace isnan() and isinf() with inline tests so uClibc doesn't want us to

Browse Source 
link sort against libm.  This adds 22 bytes for glibc but is a win for uClibc,
and since glibc is bigger than all of busybox it seems kind of silly to worry
about it.
This commit is contained in:
Rob Landley 2006-05-09 23:14:39 +00:00
parent c503df5bdd
commit f893250a3b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
coreutils/sort.c
View File

@ -176,12 +176,14 @@ static int compare_keys(const void *xarg, const void *yarg)
/* not numbers < NaN < -infinity < numbers < +infinity) */ /* not numbers < NaN < -infinity < numbers < +infinity) */
if(x==xx) retval=(y==yy ? 0 : -1); if(x==xx) retval=(y==yy ? 0 : -1);
else if(y==yy) retval=1; else if(y==yy) retval=1;
else if(isnan(dx)) retval=isnan(dy) ? 0 : -1; /* Check for isnan */
else if(isnan(dy)) retval=1; else if(dx != dx) retval = (dy != dy) ? 0 : -1;
else if(isinf(dx)) { else if(dy != dy) retval = 1;
if(dx<0) retval=((isinf(dy) && dy<0) ? 0 : -1); /* Check for infinity. Could underflow, but it avoids libm. */
else retval=((isinf(dy) && dy>0) ? 0 : 1); else if(1.0/dx == 0.0) {
} else if(isinf(dy)) retval=dy<0 ? 1 : -1; if(dx<0) retval=((1.0/dy == 0.0 && dy<0) ? 0 : -1);
else retval=((1.0/dy == 0.0 && dy>0) ? 0 : 1);
} else if(1.0/dy == 0.0) retval=dy<0 ? 1 : -1;
else retval=dx>dy ? 1 : (dx<dy ? -1 : 0); else retval=dx>dy ? 1 : (dx<dy ? -1 : 0);
break; break;
} }