revert s/assert/exit changes

Author: Rafael Vanoni

mtbl/compression.c

@@ -482,14 +482,8 @@ _mtbl_decompress_zlib(
 
 	do {
 		zret = inflate(&zs, Z_FINISH);
-		if (zret != Z_STREAM_END && zret != Z_BUF_ERROR) {
-			goto fail;
-		}
-
+		assert(zret == Z_STREAM_END || zret == Z_BUF_ERROR);
 		if (zret != Z_STREAM_END) {
-			if (*output_size > SIZE_MAX / 2) {
-				goto fail;
-			}
 			*output = my_realloc(*output, *output_size * 2);
 			zs.next_out = *output + *output_size;
 			zs.avail_out = *output_size;
@@ -499,11 +493,6 @@ _mtbl_decompress_zlib(
 
 	*output_size = zs.total_out;
 	inflateEnd(&zs);
+
 	return (mtbl_res_success);
-fail:
-	free(*output);
-	*output = NULL;
-	*output_size = 0;
-	inflateEnd(&zs);
-	return (mtbl_res_failure);
 }

mtbl/sorter.c

@@ -140,11 +140,7 @@ mtbl_sorter_init(const struct mtbl_sorter_options *opt)
 	if (s->opt.pool != NULL) {
 		s->pool = s->opt.pool->pool;
 		s->rhandler = result_handler_init(_collect_readers_cb, s);
-		if (s->rhandler == NULL) {
-			entry_vec_destroy(&s->vec);
-			reader_vec_destroy(&s->readers);
-			return (NULL);
-		}
+		assert (s->rhandler != NULL);
 	}
 
 	return (s);
@@ -198,18 +194,9 @@ _mtbl_sorter_write_chunk(struct entry_batch *b)
 	ubuf_append(tmp_fname, (const uint8_t *) "\x00", 1);
 
 	int fd = mkstemp((char *) ubuf_data(tmp_fname));
-	if (fd < 0) {
-		ubuf_destroy(&tmp_fname);
-		return (NULL);
-	}
-
+	assert(fd >= 0);
 	int unlink_ret = unlink((char *) ubuf_data(tmp_fname));
-	if (unlink_ret == -1) {
-		ubuf_destroy(&tmp_fname);
-		close(fd);
-		return (NULL);
-	}
-
+	assert(unlink_ret == 0);
 	ubuf_destroy(&tmp_fname);
 
 	struct mtbl_writer_options *wopt = mtbl_writer_options_init();

mtbl/writer.c

@@ -146,10 +146,7 @@ mtbl_writer_init_fd(int orig_fd, const struct mtbl_writer_options *opt)
 	int fd;
 
 	fd = dup(orig_fd);
-	if (fd < 0) {
-		return (NULL);
-	}
-
+	assert(fd >= 0);
 	w = my_calloc(1, sizeof(*w));
 	if (opt == NULL) {
 		w->opt.compression_type = DEFAULT_COMPRESSION_TYPE;
@@ -166,14 +163,9 @@ mtbl_writer_init_fd(int orig_fd, const struct mtbl_writer_options *opt)
 	 * to reserve some initial bytes in the file.
 	 */
 	off_t offset = lseek(fd, 0, SEEK_CUR);
-	if (offset == (off_t)-1) {
-		close(fd);
-		free(w);
-		return (NULL);
-	}
-	w->last_offset = (uint64_t)offset;
+	assert(offset != (off_t)-1);
 
-	w->pending_offset = w->last_offset;
+	w->pending_offset = (uint64_t)offset;
 	w->last_key = ubuf_init(256);
 	w->m.file_version = MTBL_FORMAT_V2;
 	w->m.compression_algorithm = w->opt.compression_type;
@@ -185,11 +177,7 @@ mtbl_writer_init_fd(int orig_fd, const struct mtbl_writer_options *opt)
 	if (w->opt.pool != NULL) {
 		w->pool = w->opt.pool->pool;
 		w->rhandler = result_handler_init(_write_data_block_wrapper, w);
-		if (w->rhandler == NULL) {
-			close(fd);
-			free(w);
-			return (NULL);
-		}
+		assert (w->rhandler != NULL);
 	}
 
 	return (w);