caleb-brown/redict
1
0
Fork 0
mirror of https://codeberg.org/redict/redict.git synced 2025-01-23 00:28:26 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

set: fix the int problem for qsort

Browse Source
This commit is contained in:
zhaozhao.zz 2017-12-05 17:42:19 +08:00
parent de809666f8
commit 42387d6c1a
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/t_set.c
View File

@ -774,15 +774,21 @@ void srandmemberCommand(client *c) {
} }
int qsortCompareSetsByCardinality(const void *s1, const void *s2) { int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
return setTypeSize(*(robj**)s1)-setTypeSize(*(robj**)s2); if (setTypeSize(*(robj**)s1) > setTypeSize(*(robj**)s2)) return 1;
if (setTypeSize(*(robj**)s1) < setTypeSize(*(robj**)s2)) return -1;
return 0;
} }
/* This is used by SDIFF and in this case we can receive NULL that should /* This is used by SDIFF and in this case we can receive NULL that should
* be handled as empty sets. */ * be handled as empty sets. */
int qsortCompareSetsByRevCardinality(const void *s1, const void *s2) { int qsortCompareSetsByRevCardinality(const void *s1, const void *s2) {
robj *o1 = *(robj**)s1, *o2 = *(robj**)s2; robj *o1 = *(robj**)s1, *o2 = *(robj**)s2;
unsigned long first = o1 ? setTypeSize(o1) : 0;
unsigned long second = o2 ? setTypeSize(o2) : 0;
return (o2 ? setTypeSize(o2) : 0) - (o1 ? setTypeSize(o1) : 0); if (first < second) return 1;
if (first > second) return -1;
return 0;
} }
void sinterGenericCommand(client *c, robj **setkeys, void sinterGenericCommand(client *c, robj **setkeys,