branches/zip: Clean up.

cmp_rec_rec_with_match(): Initialize ret=0.  Remove assignments ret=0.

rec_init_offsets(): Remove bogus comment.

rem/rem0cmp.c

@@ -745,7 +745,7 @@ cmp_rec_rec_with_match(
 	ulint		cur_field;	/* current field number */
 	ulint		cur_bytes;	/* number of already matched
 					bytes in current field */
-	int		ret = 3333;	/* return value */
+	int		ret = 0;	/* return value */
 	ulint		comp;
 
 	ut_ad(rec1 && rec2 && index);
@@ -791,10 +791,8 @@ cmp_rec_rec_with_match(
 				if (rec_get_info_bits(rec1, comp)
 				    & REC_INFO_MIN_REC_FLAG) {
 
-					if (rec_get_info_bits(rec2, comp)
-					    & REC_INFO_MIN_REC_FLAG) {
-						ret = 0;
-					} else {
+					if (!(rec_get_info_bits(rec2, comp)
+					      & REC_INFO_MIN_REC_FLAG)) {
 						ret = -1;
 					}
 
@@ -814,8 +812,6 @@ cmp_rec_rec_with_match(
 				/* We do not compare to an externally
 				stored field */
 
-				ret = 0;
-
 				goto order_resolved;
 			}
 
@@ -935,8 +931,9 @@ cmp_rec_rec_with_match(
 
 	ut_ad(cur_bytes == 0);
 
-	ret = 0;	/* If we ran out of fields, rec1 was equal to rec2 up
-			to the common fields */
+	/* If we ran out of fields, rec1 was equal to rec2 up
+	to the common fields */
+	ut_ad(ret == 0);
 order_resolved:
 
 	ut_ad((ret >= - 1) && (ret <= 1));

rem/rem0rec.c

@@ -229,7 +229,6 @@ static
 void
 rec_init_offsets(
 /*=============*/
-				/* out: the offsets */
 	const rec_t*	rec,	/* in: physical record */
 	dict_index_t*	index,	/* in: record descriptor */
 	ulint*		offsets)/* in/out: array of offsets;