database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-02 04:21:28 +03:00
Code Activity

Message style improvements

Browse Source
This commit is contained in:
Peter Eisentraut
2017-08-04 18:31:01 -04:00
parent 620b49a16d
commit 26d40ada3f
8 changed files with 29 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/pg_basebackup/pg_receivewal.c
View File

@@ -280,7 +280,7 @@ FindStreamingStart(uint32 *tli)
}
if (lseek(fd, (off_t) (-4), SEEK_END) < 0)
{
fprintf(stderr, _("%s: could not seek compressed file \"%s\": %s\n"),
fprintf(stderr, _("%s: could not seek in compressed file \"%s\": %s\n"),
progname, fullpath, strerror(errno));
disconnect_and_exit(1);
}

6
src/bin/pg_basebackup/receivelog.c
View File

@@ -136,7 +136,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
if (stream->walmethod->sync(f) != 0)
{
fprintf(stderr,
_("%s: could not sync existing write-ahead log file \"%s\": %s\n"),
_("%s: could not fsync existing write-ahead log file \"%s\": %s\n"),
progname, fn, stream->walmethod->getlasterror());
stream->walmethod->close(f, CLOSE_UNLINK);
return false;
@@ -151,7 +151,9 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
if (errno == 0)
errno = ENOSPC;
fprintf(stderr,
_("%s: write-ahead log file \"%s\" has %d bytes, should be 0 or %d\n"),
ngettext("%s: write-ahead log file \"%s\" has %d byte, should be 0 or %d\n",
"%s: write-ahead log file \"%s\" has %d bytes, should be 0 or %d\n",
size),
progname, fn, (int) size, XLogSegSize);
return false;
}

20
src/bin/pg_basebackup/walmethods.c
View File

@@ -432,7 +432,7 @@ tar_write_compressed_data(void *buf, size_t count, bool flush)
r = deflate(tar_data->zp, flush ? Z_FINISH : Z_NO_FLUSH);
if (r == Z_STREAM_ERROR)
{
tar_set_error("deflate failed");
tar_set_error("could not compress data");
return false;
}
@@ -456,7 +456,7 @@ tar_write_compressed_data(void *buf, size_t count, bool flush)
/* Reset the stream for writing */
if (deflateReset(tar_data->zp) != Z_OK)
{
tar_set_error("deflateReset failed");
tar_set_error("could not reset compression stream");
return false;
}
}
@@ -557,7 +557,7 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
{
pg_free(tar_data->zp);
tar_data->zp = NULL;
tar_set_error("deflateInit2 failed");
tar_set_error("could not initialize compression library");
return NULL;
}
}
@@ -569,7 +569,7 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
Assert(tar_data->currentfile == NULL);
if (tar_data->currentfile != NULL)
{
tar_set_error("implementation error: tar files can't have more than one open file\n");
tar_set_error("implementation error: tar files can't have more than one open file");
return NULL;
}
@@ -597,7 +597,7 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
/* Turn off compression for header */
if (deflateParams(tar_data->zp, 0, 0) != Z_OK)
{
tar_set_error("deflateParams failed");
tar_set_error("could not change compression parameters");
return NULL;
}
}
@@ -635,7 +635,7 @@ tar_open_for_write(const char *pathname, const char *temp_suffix, size_t pad_to_
/* Re-enable compression for the rest of the file */
if (deflateParams(tar_data->zp, tar_data->compression, 0) != Z_OK)
{
tar_set_error("deflateParams failed");
tar_set_error("could not change compression parameters");
return NULL;
}
}
@@ -824,7 +824,7 @@ tar_close(Walfile f, WalCloseMethod method)
/* Turn off compression */
if (deflateParams(tar_data->zp, 0, 0) != Z_OK)
{
tar_set_error("deflateParams failed");
tar_set_error("could not change compression parameters");
return -1;
}
@@ -835,7 +835,7 @@ tar_close(Walfile f, WalCloseMethod method)
/* Turn compression back on */
if (deflateParams(tar_data->zp, tar_data->compression, 0) != Z_OK)
{
tar_set_error("deflateParams failed");
tar_set_error("could not change compression parameters");
return -1;
}
}
@@ -901,7 +901,7 @@ tar_finish(void)
if (r == Z_STREAM_ERROR)
{
tar_set_error("deflate failed");
tar_set_error("could not compress data");
return false;
}
if (tar_data->zp->avail_out < ZLIB_OUT_SIZE)
@@ -917,7 +917,7 @@ tar_finish(void)
if (deflateEnd(tar_data->zp) != Z_OK)
{
tar_set_error("deflateEnd failed");
tar_set_error("could not close compression stream");
return false;
}
}