mirror of
https://github.com/pgbackrest/pgbackrest.git
synced 2025-01-30 05:39:12 +02:00
Fix comment indentation and wrapping.
This commit is contained in:
parent
bfc9a5c33e
commit
008a18555c
@ -164,8 +164,8 @@ httpResponseRead(THIS_VOID, Buffer *buffer, bool block)
|
||||
// If no content remaining
|
||||
if (this->contentRemaining == 0)
|
||||
{
|
||||
// If chunked then consume the blank line that follows every chunk. There might be more chunk data so loop back
|
||||
// around to check.
|
||||
// If chunked then consume the blank line that follows every chunk. There might be more chunk data so loop
|
||||
// back around to check.
|
||||
if (this->contentChunked)
|
||||
{
|
||||
ioReadLine(rawRead);
|
||||
|
@ -156,7 +156,7 @@ sckOptionSet(int fd)
|
||||
}
|
||||
#endif
|
||||
|
||||
// Set TCP_KEEPINTVL when available
|
||||
// Set TCP_KEEPINTVL when available
|
||||
#ifdef TCP_KEEPIDLE
|
||||
if (socketLocal.tcpKeepAliveInterval > 0)
|
||||
{
|
||||
|
@ -315,11 +315,11 @@ tlsServerNew(
|
||||
// Let server set cipher order
|
||||
SSL_OP_CIPHER_SERVER_PREFERENCE |
|
||||
#ifdef SSL_OP_NO_RENEGOTIATION
|
||||
// Disable renegotiation, available since 1.1.0h. This affects only TLSv1.2 and older protocol versions as TLSv1.3 has
|
||||
// Disable renegotiation, available since 1.1.0h. This affects only TLSv1.2 and older protocol versions as TLSv1.3 has
|
||||
// no support for renegotiation.
|
||||
SSL_OP_NO_RENEGOTIATION |
|
||||
#endif
|
||||
// Disable session tickets
|
||||
// Disable session tickets
|
||||
SSL_OP_NO_TICKET);
|
||||
|
||||
// Disable session caching
|
||||
|
@ -202,7 +202,7 @@ infoBackupLoadCallback(void *data, const String *section, const String *key, con
|
||||
// Database id
|
||||
info.backupPgId = jsonReadUInt(jsonReadKeyRequireZ(json, INFO_KEY_DB_ID));
|
||||
|
||||
// Options
|
||||
// Options
|
||||
info.optionArchiveCheck = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_ARCHIVE_CHECK));
|
||||
info.optionArchiveCopy = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_ARCHIVE_COPY));
|
||||
info.optionBackupStandby = jsonReadBool(jsonReadKeyRequireZ(json, INFO_BACKUP_KEY_OPT_BACKUP_STANDBY));
|
||||
|
4
src/protocol/helper.c
Normal file → Executable file
4
src/protocol/helper.c
Normal file → Executable file
@ -559,8 +559,8 @@ protocolRemoteParam(ProtocolStorageType protocolStorageType, unsigned int hostId
|
||||
}
|
||||
}
|
||||
|
||||
// Remove options that have been marked for removal if they are not already null or invalid. This is more efficient because
|
||||
// cfgExecParam() won't have to search through as large a list looking for overrides.
|
||||
// Remove options that have been marked for removal if they are not already null or invalid. This is more efficient
|
||||
// because cfgExecParam() won't have to search through as large a list looking for overrides.
|
||||
if (remove)
|
||||
{
|
||||
// Loop through option indexes
|
||||
|
2
src/storage/posix/write.c
Normal file → Executable file
2
src/storage/posix/write.c
Normal file → Executable file
@ -86,7 +86,7 @@ storageWritePosixOpen(THIS_VOID)
|
||||
// Attempt to create the path if it is missing
|
||||
if (this->fd == -1 && errno == ENOENT && this->interface.createPath) // {vm_covered}
|
||||
{
|
||||
// Create the path
|
||||
// Create the path
|
||||
storageInterfacePathCreateP(this->storage, this->path, false, false, this->interface.modePath);
|
||||
|
||||
// Open file again
|
||||
|
@ -241,7 +241,7 @@ storageWriteS3Close(THIS_VOID)
|
||||
.content = xmlDocumentBuf(partList));
|
||||
HttpResponse *response = storageS3ResponseP(request);
|
||||
|
||||
// Error if there is no etag in the result. This indicates that the request did not succeed despite the success code.
|
||||
// Error when no etag in the result. This indicates that the request did not succeed despite the success code.
|
||||
if (xmlNodeChild(
|
||||
xmlDocumentRoot(xmlDocumentNewBuf(httpResponseContent(response))), S3_XML_TAG_ETAG_STR, false) == NULL)
|
||||
{
|
||||
|
2
test/src/module/common/lockTest.c
Normal file → Executable file
2
test/src/module/common/lockTest.c
Normal file → Executable file
@ -184,7 +184,7 @@ testRun(void)
|
||||
"lock is already held by this process");
|
||||
TEST_RESULT_VOID(lockRelease(true), "release archive lock");
|
||||
|
||||
// // -------------------------------------------------------------------------------------------------------------------------
|
||||
// -------------------------------------------------------------------------------------------------------------------------
|
||||
lockLocal.execId = STRDEF("2-test");
|
||||
|
||||
TEST_ASSIGN(lockFdTest, lockAcquireFile(backupLockFile, 0, true), "backup lock by file");
|
||||
|
Loading…
x
Reference in New Issue
Block a user