diff options
| author | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-18 14:50:49 (GMT) |
|---|---|---|
| committer | Magnus Lundborg <lundborg.magnus@gmail.com> | 2013-10-18 14:50:49 (GMT) |
| commit | 885f2782f9f48b69bc229612b0734b4de48b890b (patch) | |
| tree | cac2a279edf40e11451345a6d9d7fd2b6b8940a8 /src/compression | |
| parent | 9d160c05712d8e6cf2dc42bf8ec03449ead5491f (diff) | |
Fixed a few more compiler warnings.
Diffstat (limited to 'src/compression')
| -rw-r--r-- | src/compression/merge_sort.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compression/merge_sort.c b/src/compression/merge_sort.c index 6b6049f..204243b 100644 --- a/src/compression/merge_sort.c +++ b/src/compression/merge_sort.c @@ -18,7 +18,7 @@ #include "compression/merge_sort.h" static void ms_inner(void *base, size_t size, - int start, int end, + size_t start, size_t end, int (*compar)(const void *v1,const void *v2,const void *private), const void *private, char *workarray) @@ -30,7 +30,7 @@ static void ms_inner(void *base, size_t size, middle=start+(end-start)/2; #if 0 printf("For start %d end %d obtained new middle: %d\n",start,end,middle); -#endif +#endif ms_inner(base,size, start,middle, compar,private,workarray); @@ -66,7 +66,7 @@ static void ms_inner(void *base, size_t size, if (compar(cbase+ileft*size,cbase+iright*size,private)>0) { memcpy(workarray+i*size,cbase+iright*size,size); - iright++; + iright++; } else { |