branches/zip: Revert r1523. Passing extra parameters to SORT_FUN and CMP_FUN

of UT_SORT_FUNCTION_BODY is best done by defining SORT_FUN and CMP_FUN as
macros when needed.  The solution of r1523 allows for only one extra parameter.

include/ut0sort.h

@@ -24,17 +24,16 @@ The sort function uses mergesort and must be defined separately
 for each type of array.
 Also the comparison function has to be defined individually
 for each array cell type. SORT_FUN is the sort function name.
-CTX is extra context passed as the first parameter of SORT_FUN.
 The function takes the array to be sorted (ARR),
 the array of auxiliary space (AUX_ARR) of same size,
 and the low (LOW), inclusive, and high (HIGH), noninclusive,
 limits for the sort interval as arguments.
-CMP_FUN is the comparison function name. It takes as arguments CTX and
+CMP_FUN is the comparison function name. It takes as arguments
 two elements from the array and returns 1, if the first is bigger,
 0 if equal, and -1 if the second bigger. For an eaxmaple of use
 see test program in tsut.c. */
 
-#define UT_SORT_FUNCTION_BODY(SORT_FUN, CTX, ARR, AUX_ARR, LOW, HIGH, CMP_FUN)\
+#define UT_SORT_FUNCTION_BODY(SORT_FUN, ARR, AUX_ARR, LOW, HIGH, CMP_FUN)\
 {\
 	ulint		ut_sort_mid77;\
 	ulint		ut_sort_i77;\
@@ -48,7 +47,7 @@ see test program in tsut.c. */
 	if ((LOW) == (HIGH) - 1) {\
 		return;\
 	} else if ((LOW) == (HIGH) - 2) {\
-		if (CMP_FUN(CTX, (ARR)[LOW], (ARR)[(HIGH) - 1]) > 0) {\
+		if (CMP_FUN((ARR)[LOW], (ARR)[(HIGH) - 1]) > 0) {\
 			(AUX_ARR)[LOW] = (ARR)[LOW];\
 			(ARR)[LOW] = (ARR)[(HIGH) - 1];\
 			(ARR)[(HIGH) - 1] = (AUX_ARR)[LOW];\
@@ -58,8 +57,8 @@ see test program in tsut.c. */
 \
 	ut_sort_mid77 = ((LOW) + (HIGH)) / 2;\
 \
-	SORT_FUN(CTX, (ARR), (AUX_ARR), (LOW), ut_sort_mid77);\
-	SORT_FUN(CTX, (ARR), (AUX_ARR), ut_sort_mid77, (HIGH));\
+	SORT_FUN((ARR), (AUX_ARR), (LOW), ut_sort_mid77);\
+	SORT_FUN((ARR), (AUX_ARR), ut_sort_mid77, (HIGH));\
 \
 	ut_sort_low77 = (LOW);\
 	ut_sort_high77 = ut_sort_mid77;\
@@ -72,7 +71,7 @@ see test program in tsut.c. */
 		} else if (ut_sort_high77 >= (HIGH)) {\
 			(AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_low77];\
 			ut_sort_low77++;\
-		} else if (CMP_FUN(CTX, (ARR)[ut_sort_low77],\
+		} else if (CMP_FUN((ARR)[ut_sort_low77],\
 				   (ARR)[ut_sort_high77]) > 0) {\
 			(AUX_ARR)[ut_sort_i77] = (ARR)[ut_sort_high77];\
 			ut_sort_high77++;\

page/page0zip.c

@@ -1261,11 +1261,8 @@ page_zip_dir_sort(
 	ulint	low,	/* in: lower bound of the sorting area, inclusive */
 	ulint	high)	/* in: upper bound of the sorting area, exclusive */
 {
-#define page_zip_dir_sort_ctx(c,a,aux,lo,hi) page_zip_dir_sort(a,aux,lo,hi)
-#define page_zip_dir_cmp_ctx(c,a,b) page_zip_dir_cmp(a,b)
-
-	UT_SORT_FUNCTION_BODY(page_zip_dir_sort_ctx,, arr, aux_arr, low, high,
-			      page_zip_dir_cmp_ctx);
+	UT_SORT_FUNCTION_BODY(page_zip_dir_sort, arr, aux_arr, low, high,
+			      page_zip_dir_cmp);
 }
 
 /**************************************************************************

ut/ut0byte.c

@@ -27,10 +27,7 @@ void
 ut_dulint_sort(dulint* arr, dulint* aux_arr, ulint low, ulint high)
 /*===============================================================*/
 {
-#define ut_dulint_sort_ctx(c,a,aux,lo,hi) ut_dulint_sort(a,aux,lo,hi)
-#define ut_dulint_cmp_ctx(c,a,b) ut_dulint_cmp(a,b)
-
-	UT_SORT_FUNCTION_BODY(ut_dulint_sort_ctx,, arr, aux_arr, low, high,
-			      ut_dulint_cmp_ctx);
+	UT_SORT_FUNCTION_BODY(ut_dulint_sort, arr, aux_arr, low, high,
+			      ut_dulint_cmp);
 }
 #endif /* notdefined */

ut/ut0ut.c

@@ -376,11 +376,8 @@ void
 ut_ulint_sort(ulint* arr, ulint* aux_arr, ulint low, ulint high)
 /*============================================================*/
 {
-#define ut_ulint_sort_ctx(c,a,aux,lo,hi) ut_ulint_sort(a,aux,lo,hi)
-#define ut_ulint_cmp_ctx(c,a,b) ut_ulint_cmp(a,b)
-
-	UT_SORT_FUNCTION_BODY(ut_ulint_sort_ctx,, arr, aux_arr, low, high,
-			      ut_ulint_cmp_ctx);
+	UT_SORT_FUNCTION_BODY(ut_ulint_sort, arr, aux_arr, low, high,
+			      ut_ulint_cmp);
 }
 
 /*****************************************************************