Skip to content

Commit a37f8e5

Browse files
committed
[Issue #240] minor fixes
1 parent 83ba57f commit a37f8e5

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

src/pg_probackup.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -1185,8 +1185,7 @@ extern datapagemap_t *fio_get_lsn_map(const char *fullpath, uint32 checksum_vers
11851185
fio_location location);
11861186
extern pid_t fio_check_postmaster(const char *pgdata, fio_location location);
11871187

1188-
extern int32 fio_decompress(void* dst, void const* src, size_t size, int compress_alg);
1189-
extern int32 fio_decompress_silent(void* dst, void const* src, size_t size, int compress_alg, char **errormsg);
1188+
extern int32 fio_decompress(void* dst, void const* src, size_t size, int compress_alg, char **errormsg);
11901189

11911190
/* return codes for fio_send_pages() and fio_send_file() */
11921191
#define SEND_OK (0)

src/utils/file.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@ ssize_t fio_fwrite_async_compressed(FILE* f, void const* buf, size_t size, int c
856856
{
857857
char uncompressed_buf[BLCKSZ];
858858
char *errormsg = NULL;
859-
int32 uncompressed_size = fio_decompress_silent(uncompressed_buf, buf, size, compress_alg, &errormsg);
859+
int32 uncompressed_size = fio_decompress(uncompressed_buf, buf, size, compress_alg, &errormsg);
860860

861861
if (uncompressed_size < 0)
862862
elog(ERROR, "%s", errormsg);
@@ -879,7 +879,7 @@ fio_write_compressed_impl(int fd, void const* buf, size_t size, int compress_alg
879879
return;
880880

881881
/* TODO: We cannot allow error out in fio_decompress */
882-
uncompressed_size = fio_decompress_silent(uncompressed_buf, buf, size, compress_alg, &async_errormsg);
882+
uncompressed_size = fio_decompress(uncompressed_buf, buf, size, compress_alg, &async_errormsg);
883883

884884
if (uncompressed_size < 0)
885885
return;

0 commit comments

Comments
 (0)