Changeset: da3ac838f56b for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da3ac838f56b
Modified Files:
gdk/gdk_ssort.c
Branch: Dec2016
Log Message:
Fix significant typo in stable sort.
(Plus some layout.)
diffs (53 lines):
diff --git a/gdk/gdk_ssort.c b/gdk/gdk_ssort.c
--- a/gdk/gdk_ssort.c
+++ b/gdk/gdk_ssort.c
@@ -58,9 +58,9 @@ typedef struct {
/* 'ah' and 'at' are temp storage to help with merges. They
* contain room for alloced[ht] entries. */
- void **ah;
+ void *ah;
ssize_t allocedh;
- void **at;
+ void *at;
ssize_t allocedt;
/* A stack of n pending runs yet to be merged. Run #i starts
@@ -101,7 +101,7 @@ merge_freemem(MergeState *ms)
/* Ensure enough temp memory for 'need' array slots is available.
* Returns 0 on success and -1 if the memory can't be gotten. */
static int
-merge_getmem(MergeState *ms, ssize_t need, void ***ap,
+merge_getmem(MergeState *ms, ssize_t need, void **ap,
ssize_t *allocedp, int s, char *temparray)
{
assert(ms != NULL);
@@ -177,23 +177,23 @@ merge_getmem(MergeState *ms, ssize_t nee
case 0: \
break; \
case sizeof(bte): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((bte*)(d))[i] = ((bte*)(s))[i]; \
break; \
case sizeof(sht): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((sht*)(d))[i] = ((sht*)(s))[i]; \
break; \
case sizeof(int): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((int*)(d))[i] = ((int*)(s))[i]; \
break; \
case sizeof(lng): \
- for(i=0; i<N; i++) \
+ for (i = 0; i < N; i++) \
((lng*)(d))[i] = ((lng*)(s))[i]; \
break; \
case 2 * sizeof(lng): \
- for(i=0; i<(N<2); i++) \
+ for (i = 0; i < N*2; i++) \
((lng*)(d))[i] = ((lng*)(s))[i]; \
break; \
default: \
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
