DragonX/hush3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert qsort changes

Browse Source
This commit is contained in:
jl777
2019-04-11 19:48:16 -11:00
parent 2a31c4558a
commit adf03266d4
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cryptoconditions/src/asn/constr_SET_OF.c
View File

@@ -301,9 +301,9 @@ static int _el_buf_cmp(const void *ap, const void *bp) {
ret = -1;
else if(a->length > b->length)
ret = 1;
else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
ret = -1;
else ret = 1;
// else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
// ret = -1;
// else ret = 1;
}
return ret;

9
src/cryptoconditions/src/threshold.c
View File

@@ -39,7 +39,7 @@ static int cmpCostDesc(const void *a, const void *b)
{
int retval;
retval = (int) ( *(unsigned long*)b - *(unsigned long*)a );
if ( retval != 0 )
//if ( retval != 0 )
return(retval);
else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
return(-1);
@@ -86,9 +86,10 @@ static int cmpConditionBin(const void *a, const void *b) {
if (ret == 0)
return r0.encoded < r1.encoded ? -1 : 1;
else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
return(-1);
else return(1);
//else if ( (uint64_t)a < (uint64_t)b ) // jl777 prevent nondeterminism
// return(-1);
//else return(1);
return(0);
}

2
src/pow/tromp/equi.h
View File

@@ -78,7 +78,7 @@ int compu32(const void *pa, const void *pb) {
int32_t retval;
u32 a = *(u32 *)pa, b = *(u32 *)pb;
retval = a<b ? -1 : a==b ? 0 : +1;
if ( retval != 0 )
//if ( retval != 0 )
return(retval);
else if ( (uint64_t)pa < (uint64_t)pb ) // jl777 prevent nondeterminism
return(-1);