arno/hashcat
1
0
Fork 0
mirror of https://github.com/hashcat/hashcat.git synced 2024-11-26 09:58:16 +00:00
Code Issues Releases Wiki Activity

Fix some code in sort_r.h to make cppcheck happy

Browse Source
This commit is contained in:
jsteube 2016-11-16 16:50:33 +01:00
parent 9e947b64ec
commit 6bc7a94c73
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/sort_r.h
View File

@ -49,9 +49,9 @@ static _SORT_R_INLINE int sort_r_cmpswap(char *__restrict a, char *__restrict b,
void *_arg), void *_arg),
void *arg) void *arg)
{ {
char tmp, *end = a+w; char *end = a+w;
if(compar(a, b, arg) > 0) { if(compar(a, b, arg) > 0) {
for(; a < end; a++, b++) { tmp = *a; *a = *b; *b = tmp; } for(; a < end; a++, b++) { char tmp = *a; *a = *b; *b = tmp; }
return 1; return 1;
} }
return 0; return 0;
@ -77,7 +77,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
/* nel > 6; Quicksort */ /* nel > 6; Quicksort */
/* Use median of first, middle and last items as pivot */ /* Use median of first, middle and last items as pivot */
char *x, *y, *xend, ch; char *x, *y, *xend;
char *pl, *pr; char *pl, *pr;
char *last = b+w*(nel-1), *tmp; char *last = b+w*(nel-1), *tmp;
char *l[3]; char *l[3];
@ -93,7 +93,7 @@ static _SORT_R_INLINE void sort_r_simple(void *base, size_t nel, size_t w,
/* swap l[id], l[2] to put pivot as last element */ /* swap l[id], l[2] to put pivot as last element */
for(x = l[1], y = last, xend = x+w; x<xend; x++, y++) { for(x = l[1], y = last, xend = x+w; x<xend; x++, y++) {
ch = *x; *x = *y; *y = ch; char ch = *x; *x = *y; *y = ch;
} }
pl = b; pl = b;