geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drmSL: Fix neighbor lookup 

Commit e4a519635f75bde38aeb5b09f2ff4efbf73453e9:
    Tidy up compile warnings by cleaning up types.

removed call to SLLocate which gutted the function of all functionality.
This patch restores the original behavior, with an additional fix
that zeros the update array in case SLLocate bails early.

v2: zero the update array instead of checking the return value.
    SLLocate returns NULL both on failure and if the element is greater
    than everything in the list
v3: Improve commit message

Signed-off-by: Jan Vesely <jan.vesely@rutgers.edu>
Acked-by: Emil Velikov <emil.l.velikov@gmail.com>
main
Jan Vesely 2015-02-27 12:20:32 -05:00
parent bc6b5174d3
commit 3b2ee2b5bf
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xf86drmSL.c
View File

@ -264,9 +264,11 @@ int drmSLLookupNeighbors(void *l, unsigned long key,
unsigned long *next_key, void **next_value) unsigned long *next_key, void **next_value)
{ {
SkipListPtr list = (SkipListPtr)l; SkipListPtr list = (SkipListPtr)l;
SLEntryPtr update[SL_MAX_LEVEL + 1]; SLEntryPtr update[SL_MAX_LEVEL + 1] = {0};
int retcode = 0; int retcode = 0;
SLLocate(list, key, update);
*prev_key = *next_key = key; *prev_key = *next_key = key;
*prev_value = *next_value = NULL; *prev_value = *next_value = NULL;