From a174cdff4ec8aad59f5bcc7e8d52218a14fe56fc Mon Sep 17 00:00:00 2001 From: Georgios Kokolatos Date: Fri, 17 Mar 2023 14:45:58 +0000 Subject: [PATCH v3 1/3] Improve type handling in pg_dump's compress file API The function LZ4File_gets() was storing the return value of LZ4File_read_internal in a variable of the wrong type, disregarding sign-es. As a consequence, LZ4File_gets() would not take the error path when it should. In an attempt to improve readability and code uniformity, change the return type of the API's read and write functions to bool from size_t. Along with it, homogenize the return values of the relevant functions of this API. This change, helps the specific compression implementations handle the return types of their corresponding libraries internally and not expose them to the API caller. In passing save the appropriate errno in LZ4File_open_write in case that the caller is not using the API's get_error_func. With the help and guidance of Tomas Vondra. Reported-by: Alexander Lakhin --- src/bin/pg_dump/compress_gzip.c | 37 ++++++------ src/bin/pg_dump/compress_io.c | 8 +-- src/bin/pg_dump/compress_io.h | 38 +++++++++--- src/bin/pg_dump/compress_lz4.c | 85 +++++++++++++++------------ src/bin/pg_dump/compress_none.c | 41 ++++++++----- src/bin/pg_dump/pg_backup_archiver.c | 18 ++---- src/bin/pg_dump/pg_backup_directory.c | 36 ++++++------ 7 files changed, 148 insertions(+), 115 deletions(-) diff --git a/src/bin/pg_dump/compress_gzip.c b/src/bin/pg_dump/compress_gzip.c index 0af65afeb4..79ed2cf371 100644 --- a/src/bin/pg_dump/compress_gzip.c +++ b/src/bin/pg_dump/compress_gzip.c @@ -233,14 +233,14 @@ InitCompressorGzip(CompressorState *cs, *---------------------- */ -static size_t -Gzip_read(void *ptr, size_t size, CompressFileHandle *CFH) +static bool +Gzip_read(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH) { gzFile gzfp = (gzFile) CFH->private_data; - size_t ret; + int gzret; - ret = gzread(gzfp, ptr, size); - if (ret != size && !gzeof(gzfp)) + gzret = gzread(gzfp, ptr, size); + if (gzret <= 0 && !gzeof(gzfp)) { int errnum; const char *errmsg = gzerror(gzfp, &errnum); @@ -249,15 +249,18 @@ Gzip_read(void *ptr, size_t size, CompressFileHandle *CFH) errnum == Z_ERRNO ? strerror(errno) : errmsg); } - return ret; + if (rsize) + *rsize = (size_t) gzret; + + return true; } -static size_t +static bool Gzip_write(const void *ptr, size_t size, CompressFileHandle *CFH) { gzFile gzfp = (gzFile) CFH->private_data; - return gzwrite(gzfp, ptr, size); + return gzwrite(gzfp, ptr, size) > 0; } static int @@ -287,22 +290,22 @@ Gzip_gets(char *ptr, int size, CompressFileHandle *CFH) return gzgets(gzfp, ptr, size); } -static int +static bool Gzip_close(CompressFileHandle *CFH) { gzFile gzfp = (gzFile) CFH->private_data; CFH->private_data = NULL; - return gzclose(gzfp); + return gzclose(gzfp) == Z_OK; } -static int +static bool Gzip_eof(CompressFileHandle *CFH) { gzFile gzfp = (gzFile) CFH->private_data; - return gzeof(gzfp); + return gzeof(gzfp) == 1; } static const char * @@ -319,7 +322,7 @@ Gzip_get_error(CompressFileHandle *CFH) return errmsg; } -static int +static bool Gzip_open(const char *path, int fd, const char *mode, CompressFileHandle *CFH) { gzFile gzfp; @@ -342,19 +345,19 @@ Gzip_open(const char *path, int fd, const char *mode, CompressFileHandle *CFH) gzfp = gzopen(path, mode_compression); if (gzfp == NULL) - return 1; + return false; CFH->private_data = gzfp; - return 0; + return true; } -static int +static bool Gzip_open_write(const char *path, const char *mode, CompressFileHandle *CFH) { char *fname; - int ret; int save_errno; + bool ret; fname = psprintf("%s.gz", path); ret = CFH->open_func(fname, -1, mode, CFH); diff --git a/src/bin/pg_dump/compress_io.c b/src/bin/pg_dump/compress_io.c index ce06f1eac9..8f32cb4385 100644 --- a/src/bin/pg_dump/compress_io.c +++ b/src/bin/pg_dump/compress_io.c @@ -262,7 +262,7 @@ InitDiscoverCompressFileHandle(const char *path, const char *mode) } CFH = InitCompressFileHandle(compression_spec); - if (CFH->open_func(fname, -1, mode, CFH)) + if (!CFH->open_func(fname, -1, mode, CFH)) { free_keep_errno(CFH); CFH = NULL; @@ -275,12 +275,12 @@ InitDiscoverCompressFileHandle(const char *path, const char *mode) /* * Close an open file handle and release its memory. * - * On failure, returns an error value and sets errno appropriately. + * On failure, returns false and sets errno appropriately. */ -int +bool EndCompressFileHandle(CompressFileHandle *CFH) { - int ret = 0; + bool ret = 0; if (CFH->private_data) ret = CFH->close_func(CFH); diff --git a/src/bin/pg_dump/compress_io.h b/src/bin/pg_dump/compress_io.h index cdb15951ea..7c2f9b5668 100644 --- a/src/bin/pg_dump/compress_io.h +++ b/src/bin/pg_dump/compress_io.h @@ -100,8 +100,10 @@ struct CompressFileHandle * Pass either 'path' or 'fd' depending on whether a file path or a file * descriptor is available. 'mode' can be one of 'r', 'rb', 'w', 'wb', * 'a', and 'ab'. Requires an already initialized CompressFileHandle. + * + * Returns true on success and false on error. */ - int (*open_func) (const char *path, int fd, const char *mode, + bool (*open_func) (const char *path, int fd, const char *mode, CompressFileHandle *CFH); /* @@ -109,19 +111,27 @@ struct CompressFileHandle * * 'mode' can be one of 'w', 'wb', 'a', and 'ab'. Requires an already * initialized CompressFileHandle. + * + * Returns true on success and false on error. */ - int (*open_write_func) (const char *path, const char *mode, + bool (*open_write_func) (const char *path, const char *mode, CompressFileHandle *CFH); /* * Read 'size' bytes of data from the file and store them into 'ptr'. + * Optionally it will store the number of bytes read in 'rsize'. + * + * Returns true on success and throws an internal error otherwise. */ - size_t (*read_func) (void *ptr, size_t size, CompressFileHandle *CFH); + bool (*read_func) (void *ptr, size_t size, size_t *rsize, + CompressFileHandle *CFH); /* * Write 'size' bytes of data into the file from 'ptr'. + * + * Returns true on success and false on error. */ - size_t (*write_func) (const void *ptr, size_t size, + bool (*write_func) (const void *ptr, size_t size, struct CompressFileHandle *CFH); /* @@ -130,28 +140,38 @@ struct CompressFileHandle * * Stop if an EOF or a newline is found first. 's' is always null * terminated and contains the newline if it was found. + * + * Returns 's' on success, and NULL on error or when end of file occurs + * while no characters have been read. */ char *(*gets_func) (char *s, int size, CompressFileHandle *CFH); /* * Read the next character from the compress file handle as 'unsigned * char' cast into 'int'. + * + * Returns the character read on success and throws an internal error + * otherwise. It treats EOF as error. */ int (*getc_func) (CompressFileHandle *CFH); /* * Test if EOF is reached in the compress file handle. + * + * Returns true if it is reached. */ - int (*eof_func) (CompressFileHandle *CFH); + bool (*eof_func) (CompressFileHandle *CFH); /* * Close an open file handle. + * + * Returns true on success and false on error. */ - int (*close_func) (CompressFileHandle *CFH); + bool (*close_func) (CompressFileHandle *CFH); /* - * Get a pointer to a string that describes an error that occurred during a - * compress file handle operation. + * Get a pointer to a string that describes an error that occurred during + * a compress file handle operation. */ const char *(*get_error_func) (CompressFileHandle *CFH); @@ -178,5 +198,5 @@ extern CompressFileHandle *InitCompressFileHandle(const pg_compress_specificatio */ extern CompressFileHandle *InitDiscoverCompressFileHandle(const char *path, const char *mode); -extern int EndCompressFileHandle(CompressFileHandle *CFH); +extern bool EndCompressFileHandle(CompressFileHandle *CFH); #endif diff --git a/src/bin/pg_dump/compress_lz4.c b/src/bin/pg_dump/compress_lz4.c index 63e794cdc6..278f262162 100644 --- a/src/bin/pg_dump/compress_lz4.c +++ b/src/bin/pg_dump/compress_lz4.c @@ -165,7 +165,7 @@ typedef struct LZ4File * decompressed output in the overflow buffer and the end of the backing file * is reached. */ -static int +static bool LZ4File_eof(CompressFileHandle *CFH) { LZ4File *fs = (LZ4File *) CFH->private_data; @@ -192,14 +192,16 @@ LZ4File_get_error(CompressFileHandle *CFH) * * It creates the necessary contexts for the operations. When compressing, * it additionally writes the LZ4 header in the output stream. + * + * Returns true on success and false on error. */ -static int +static bool LZ4File_init(LZ4File *fs, int size, bool compressing) { size_t status; if (fs->inited) - return 0; + return true; fs->compressing = compressing; fs->inited = true; @@ -214,7 +216,7 @@ LZ4File_init(LZ4File *fs, int size, bool compressing) if (LZ4F_isError(status)) { fs->errcode = status; - return 1; + return false; } fs->buffer = pg_malloc(fs->buflen); @@ -224,13 +226,13 @@ LZ4File_init(LZ4File *fs, int size, bool compressing) if (LZ4F_isError(status)) { fs->errcode = status; - return 1; + return false; } if (fwrite(fs->buffer, 1, status, fs->fp) != status) { errno = (errno) ? errno : ENOSPC; - return 1; + return false; } } else @@ -239,7 +241,7 @@ LZ4File_init(LZ4File *fs, int size, bool compressing) if (LZ4F_isError(status)) { fs->errcode = status; - return 1; + return false; } fs->buflen = size > LZ4_OUT_SIZE ? size : LZ4_OUT_SIZE; @@ -250,7 +252,7 @@ LZ4File_init(LZ4File *fs, int size, bool compressing) fs->overflowlen = 0; } - return 0; + return true; } /* @@ -302,15 +304,15 @@ LZ4File_read_overflow(LZ4File *fs, void *ptr, int size, bool eol_flag) static int LZ4File_read_internal(LZ4File *fs, void *ptr, int ptrsize, bool eol_flag) { - size_t dsize = 0; - size_t rsize; - size_t size = ptrsize; + int dsize = 0; + int rsize; + int size = ptrsize; bool eol_found = false; void *readbuf; /* Lazy init */ - if (LZ4File_init(fs, size, false /* decompressing */ )) + if (!LZ4File_init(fs, size, false /* decompressing */ )) return -1; /* Verify that there is enough space in the outbuf */ @@ -398,17 +400,17 @@ LZ4File_read_internal(LZ4File *fs, void *ptr, int ptrsize, bool eol_flag) fs->overflowlen += outlen; } } - } while (rsize == size && dsize < size && eol_found == 0); + } while (rsize == size && dsize < size && eol_found == false); pg_free(readbuf); - return (int) dsize; + return dsize; } /* * Compress size bytes from ptr and write them to the stream. */ -static size_t +static bool LZ4File_write(const void *ptr, size_t size, CompressFileHandle *CFH) { LZ4File *fs = (LZ4File *) CFH->private_data; @@ -416,8 +418,8 @@ LZ4File_write(const void *ptr, size_t size, CompressFileHandle *CFH) int remaining = size; /* Lazy init */ - if (LZ4File_init(fs, size, true)) - return -1; + if (!LZ4File_init(fs, size, true)) + return false; while (remaining > 0) { @@ -430,33 +432,35 @@ LZ4File_write(const void *ptr, size_t size, CompressFileHandle *CFH) if (LZ4F_isError(status)) { fs->errcode = status; - return -1; + return false; } if (fwrite(fs->buffer, 1, status, fs->fp) != status) { errno = (errno) ? errno : ENOSPC; - return 1; + return false; } } - return size; + return true; } /* * fread() equivalent implementation for LZ4 compressed files. */ -static size_t -LZ4File_read(void *ptr, size_t size, CompressFileHandle *CFH) +static bool +LZ4File_read(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH) { LZ4File *fs = (LZ4File *) CFH->private_data; int ret; - ret = LZ4File_read_internal(fs, ptr, size, false); - if (ret != size && !LZ4File_eof(CFH)) + if ((ret = LZ4File_read_internal(fs, ptr, size, false)) < 0) pg_fatal("could not read from input file: %s", LZ4File_get_error(CFH)); - return ret; + if (rsize) + *rsize = (size_t) ret; + + return true; } /* @@ -468,7 +472,7 @@ LZ4File_getc(CompressFileHandle *CFH) LZ4File *fs = (LZ4File *) CFH->private_data; unsigned char c; - if (LZ4File_read_internal(fs, &c, 1, false) != 1) + if (LZ4File_read_internal(fs, &c, 1, false) <= 0) { if (!LZ4File_eof(CFH)) pg_fatal("could not read from input file: %s", LZ4File_get_error(CFH)); @@ -486,14 +490,14 @@ static char * LZ4File_gets(char *ptr, int size, CompressFileHandle *CFH) { LZ4File *fs = (LZ4File *) CFH->private_data; - size_t dsize; + int ret; - dsize = LZ4File_read_internal(fs, ptr, size, true); - if (dsize < 0) + ret = LZ4File_read_internal(fs, ptr, size, true); + if (ret < 0 || (ret == 0 && !LZ4File_eof(CFH))) pg_fatal("could not read from input file: %s", LZ4File_get_error(CFH)); /* Done reading */ - if (dsize == 0) + if (ret == 0) return NULL; return ptr; @@ -503,13 +507,12 @@ LZ4File_gets(char *ptr, int size, CompressFileHandle *CFH) * Finalize (de)compression of a stream. When compressing it will write any * remaining content and/or generated footer from the LZ4 API. */ -static int +static bool LZ4File_close(CompressFileHandle *CFH) { FILE *fp; LZ4File *fs = (LZ4File *) CFH->private_data; size_t status; - int ret; fp = fs->fp; if (fs->inited) @@ -520,7 +523,7 @@ LZ4File_close(CompressFileHandle *CFH) if (LZ4F_isError(status)) pg_fatal("failed to end compression: %s", LZ4F_getErrorName(status)); - else if ((ret = fwrite(fs->buffer, 1, status, fs->fp)) != status) + else if (fwrite(fs->buffer, 1, status, fs->fp) != status) { errno = (errno) ? errno : ENOSPC; WRITE_ERROR_EXIT; @@ -545,10 +548,10 @@ LZ4File_close(CompressFileHandle *CFH) pg_free(fs); - return fclose(fp); + return fclose(fp) == 0; } -static int +static bool LZ4File_open(const char *path, int fd, const char *mode, CompressFileHandle *CFH) { @@ -562,23 +565,27 @@ LZ4File_open(const char *path, int fd, const char *mode, if (fp == NULL) { lz4fp->errcode = errno; - return 1; + return false; } lz4fp->fp = fp; - return 0; + return true; } -static int +static bool LZ4File_open_write(const char *path, const char *mode, CompressFileHandle *CFH) { char *fname; - int ret; + int save_errno; + bool ret; fname = psprintf("%s.lz4", path); ret = CFH->open_func(fname, -1, mode, CFH); + + save_errno = errno; pg_free(fname); + errno = save_errno; return ret; } diff --git a/src/bin/pg_dump/compress_none.c b/src/bin/pg_dump/compress_none.c index ecbcf4b04a..18f3514d11 100644 --- a/src/bin/pg_dump/compress_none.c +++ b/src/bin/pg_dump/compress_none.c @@ -83,27 +83,36 @@ InitCompressorNone(CompressorState *cs, * Private routines */ -static size_t -read_none(void *ptr, size_t size, CompressFileHandle *CFH) +static bool +read_none(void *ptr, size_t size, size_t *rsize, CompressFileHandle *CFH) { FILE *fp = (FILE *) CFH->private_data; size_t ret; if (size == 0) - return 0; + return true; ret = fread(ptr, 1, size, fp); if (ret != size && !feof(fp)) pg_fatal("could not read from input file: %s", strerror(errno)); - return ret; + if (rsize) + *rsize = ret; + + return true; } -static size_t +static bool write_none(const void *ptr, size_t size, CompressFileHandle *CFH) { - return fwrite(ptr, 1, size, (FILE *) CFH->private_data); + size_t ret; + + ret = fwrite(ptr, 1, size, (FILE *) CFH->private_data); + if (ret != size) + return false; + + return true; } static const char * @@ -136,7 +145,7 @@ getc_none(CompressFileHandle *CFH) return ret; } -static int +static bool close_none(CompressFileHandle *CFH) { FILE *fp = (FILE *) CFH->private_data; @@ -147,16 +156,16 @@ close_none(CompressFileHandle *CFH) if (fp) ret = fclose(fp); - return ret; + return ret == 0; } -static int +static bool eof_none(CompressFileHandle *CFH) { - return feof((FILE *) CFH->private_data); + return feof((FILE *) CFH->private_data) != 0; } -static int +static bool open_none(const char *path, int fd, const char *mode, CompressFileHandle *CFH) { Assert(CFH->private_data == NULL); @@ -167,21 +176,21 @@ open_none(const char *path, int fd, const char *mode, CompressFileHandle *CFH) CFH->private_data = fopen(path, mode); if (CFH->private_data == NULL) - return 1; + return false; - return 0; + return true; } -static int +static bool open_write_none(const char *path, const char *mode, CompressFileHandle *CFH) { Assert(CFH->private_data == NULL); CFH->private_data = fopen(path, mode); if (CFH->private_data == NULL) - return 1; + return false; - return 0; + return true; } /* diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c index 61ebb8fe85..6f3a85fe20 100644 --- a/src/bin/pg_dump/pg_backup_archiver.c +++ b/src/bin/pg_dump/pg_backup_archiver.c @@ -265,16 +265,13 @@ OpenArchive(const char *FileSpec, const ArchiveFormat fmt) void CloseArchive(Archive *AHX) { - int res = 0; ArchiveHandle *AH = (ArchiveHandle *) AHX; AH->ClosePtr(AH); /* Close the output */ errno = 0; - res = EndCompressFileHandle(AH->OF); - - if (res != 0) + if (!EndCompressFileHandle(AH->OF)) pg_fatal("could not close output file: %m"); } @@ -1529,7 +1526,7 @@ SetOutput(ArchiveHandle *AH, const char *filename, CFH = InitCompressFileHandle(compression_spec); - if (CFH->open_func(filename, fn, mode, CFH)) + if (!CFH->open_func(filename, fn, mode, CFH)) { if (filename) pg_fatal("could not open output file \"%s\": %m", filename); @@ -1549,12 +1546,8 @@ SaveOutput(ArchiveHandle *AH) static void RestoreOutput(ArchiveHandle *AH, CompressFileHandle *savedOutput) { - int res; - errno = 0; - res = EndCompressFileHandle(AH->OF); - - if (res != 0) + if (!EndCompressFileHandle(AH->OF)) pg_fatal("could not close output file: %m"); AH->OF = savedOutput; @@ -1694,7 +1687,8 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH) { CompressFileHandle *CFH = (CompressFileHandle *) AH->OF; - bytes_written = CFH->write_func(ptr, size * nmemb, CFH); + if (CFH->write_func(ptr, size * nmemb, CFH)) + bytes_written = size * nmemb; } if (bytes_written != size * nmemb) @@ -2243,7 +2237,7 @@ _allocAH(const char *FileSpec, const ArchiveFormat fmt, /* Open stdout with no compression for AH output handle */ out_compress_spec.algorithm = PG_COMPRESSION_NONE; CFH = InitCompressFileHandle(out_compress_spec); - if (CFH->open_func(NULL, fileno(stdout), PG_BINARY_A, CFH)) + if (!CFH->open_func(NULL, fileno(stdout), PG_BINARY_A, CFH)) pg_fatal("could not open stdout for appending: %m"); AH->OF = CFH; diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c index 41c2b733e3..525dbf9bf0 100644 --- a/src/bin/pg_dump/pg_backup_directory.c +++ b/src/bin/pg_dump/pg_backup_directory.c @@ -217,7 +217,7 @@ InitArchiveFmt_Directory(ArchiveHandle *AH) ReadToc(AH); /* Nothing else in the file, so close it again... */ - if (EndCompressFileHandle(tocFH) != 0) + if (!EndCompressFileHandle(tocFH)) pg_fatal("could not close TOC file: %m"); ctx->dataFH = NULL; } @@ -328,7 +328,7 @@ _StartData(ArchiveHandle *AH, TocEntry *te) ctx->dataFH = InitCompressFileHandle(AH->compression_spec); - if (ctx->dataFH->open_write_func(fname, PG_BINARY_W, ctx->dataFH)) + if (!ctx->dataFH->open_write_func(fname, PG_BINARY_W, ctx->dataFH)) pg_fatal("could not open output file \"%s\": %m", fname); } @@ -348,7 +348,7 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen) CompressFileHandle *CFH = ctx->dataFH; errno = 0; - if (dLen > 0 && CFH->write_func(data, dLen, CFH) != dLen) + if (dLen > 0 && !CFH->write_func(data, dLen, CFH)) { /* if write didn't set errno, assume problem is no disk space */ if (errno == 0) @@ -370,7 +370,7 @@ _EndData(ArchiveHandle *AH, TocEntry *te) lclContext *ctx = (lclContext *) AH->formatData; /* Close the file */ - if (EndCompressFileHandle(ctx->dataFH) != 0) + if (!EndCompressFileHandle(ctx->dataFH)) pg_fatal("could not close data file: %m"); ctx->dataFH = NULL; @@ -382,7 +382,7 @@ _EndData(ArchiveHandle *AH, TocEntry *te) static void _PrintFileData(ArchiveHandle *AH, char *filename) { - size_t cnt; + size_t cnt = 0; char *buf; size_t buflen; CompressFileHandle *CFH; @@ -397,13 +397,13 @@ _PrintFileData(ArchiveHandle *AH, char *filename) buf = pg_malloc(ZLIB_OUT_SIZE); buflen = ZLIB_OUT_SIZE; - while ((cnt = CFH->read_func(buf, buflen, CFH))) + while (CFH->read_func(buf, buflen, &cnt, CFH) && cnt > 0) { ahwrite(buf, 1, cnt, AH); } free(buf); - if (EndCompressFileHandle(CFH) != 0) + if (!EndCompressFileHandle(CFH)) pg_fatal("could not close data file \"%s\": %m", filename); } @@ -468,7 +468,7 @@ _LoadLOs(ArchiveHandle *AH) pg_fatal("error reading large object TOC file \"%s\"", tocfname); - if (EndCompressFileHandle(ctx->LOsTocFH) != 0) + if (!EndCompressFileHandle(ctx->LOsTocFH)) pg_fatal("could not close large object TOC file \"%s\": %m", tocfname); @@ -491,7 +491,7 @@ _WriteByte(ArchiveHandle *AH, const int i) CompressFileHandle *CFH = ctx->dataFH; errno = 0; - if (CFH->write_func(&c, 1, CFH) != 1) + if (!CFH->write_func(&c, 1, CFH)) { /* if write didn't set errno, assume problem is no disk space */ if (errno == 0) @@ -529,7 +529,7 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len) CompressFileHandle *CFH = ctx->dataFH; errno = 0; - if (CFH->write_func(buf, len, CFH) != len) + if (!CFH->write_func(buf, len, CFH)) { /* if write didn't set errno, assume problem is no disk space */ if (errno == 0) @@ -554,7 +554,7 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len) * If there was an I/O error, we already exited in readF(), so here we * exit on short reads. */ - if (CFH->read_func(buf, len, CFH) != len) + if (!CFH->read_func(buf, len, NULL, CFH)) pg_fatal("could not read from input file: end of file"); } @@ -589,7 +589,7 @@ _CloseArchive(ArchiveHandle *AH) /* The TOC is always created uncompressed */ compression_spec.algorithm = PG_COMPRESSION_NONE; tocFH = InitCompressFileHandle(compression_spec); - if (tocFH->open_write_func(fname, PG_BINARY_W, tocFH)) + if (!tocFH->open_write_func(fname, PG_BINARY_W, tocFH)) pg_fatal("could not open output file \"%s\": %m", fname); ctx->dataFH = tocFH; @@ -602,7 +602,7 @@ _CloseArchive(ArchiveHandle *AH) WriteHead(AH); AH->format = archDirectory; WriteToc(AH); - if (EndCompressFileHandle(tocFH) != 0) + if (!EndCompressFileHandle(tocFH)) pg_fatal("could not close TOC file: %m"); WriteDataChunks(AH, ctx->pstate); @@ -654,7 +654,7 @@ _StartLOs(ArchiveHandle *AH, TocEntry *te) /* The LO TOC file is never compressed */ compression_spec.algorithm = PG_COMPRESSION_NONE; ctx->LOsTocFH = InitCompressFileHandle(compression_spec); - if (ctx->LOsTocFH->open_write_func(fname, "ab", ctx->LOsTocFH)) + if (!ctx->LOsTocFH->open_write_func(fname, "ab", ctx->LOsTocFH)) pg_fatal("could not open output file \"%s\": %m", fname); } @@ -672,7 +672,7 @@ _StartLO(ArchiveHandle *AH, TocEntry *te, Oid oid) snprintf(fname, MAXPGPATH, "%s/blob_%u.dat", ctx->directory, oid); ctx->dataFH = InitCompressFileHandle(AH->compression_spec); - if (ctx->dataFH->open_write_func(fname, PG_BINARY_W, ctx->dataFH)) + if (!ctx->dataFH->open_write_func(fname, PG_BINARY_W, ctx->dataFH)) pg_fatal("could not open output file \"%s\": %m", fname); } @@ -690,13 +690,13 @@ _EndLO(ArchiveHandle *AH, TocEntry *te, Oid oid) int len; /* Close the BLOB data file itself */ - if (EndCompressFileHandle(ctx->dataFH) != 0) + if (!EndCompressFileHandle(ctx->dataFH)) pg_fatal("could not close LO data file: %m"); ctx->dataFH = NULL; /* register the LO in blobs.toc */ len = snprintf(buf, sizeof(buf), "%u blob_%u.dat\n", oid, oid); - if (CFH->write_func(buf, len, CFH) != len) + if (!CFH->write_func(buf, len, CFH)) pg_fatal("could not write to LOs TOC file"); } @@ -710,7 +710,7 @@ _EndLOs(ArchiveHandle *AH, TocEntry *te) { lclContext *ctx = (lclContext *) AH->formatData; - if (EndCompressFileHandle(ctx->LOsTocFH) != 0) + if (!EndCompressFileHandle(ctx->LOsTocFH)) pg_fatal("could not close LOs TOC file: %m"); ctx->LOsTocFH = NULL; } -- 2.34.1