db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-03-05 15:05:48 +02:00
Code Issues Releases Activity

Rename MANIFEST_FILE to BACKUP_MANIFEST_FILE.

Browse Source 
This is a bit more descriptive and avoids a naming conflict in the new C manifest code.
This commit is contained in:
David Steele 2019-09-20 08:13:36 -04:00
parent 174cb7b3af
commit 3f18040aab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/command/expire/expire.c
View File

@ -59,9 +59,9 @@ expireBackup(InfoBackup *infoBackup, String *removeBackupLabel, String *backupEx
ASSERT(removeBackupLabel != NULL);
ASSERT(backupExpired != NULL);
storageRemoveNP(storageRepoWrite(), strNewFmt(STORAGE_REPO_BACKUP "/%s/" MANIFEST_FILE, strPtr(removeBackupLabel)));
storageRemoveNP(storageRepoWrite(), strNewFmt(STORAGE_REPO_BACKUP "/%s/" BACKUP_MANIFEST_FILE, strPtr(removeBackupLabel)));
storageRemoveNP(
storageRepoWrite(), strNewFmt(STORAGE_REPO_BACKUP "/%s/" MANIFEST_FILE INFO_COPY_EXT, strPtr(removeBackupLabel)));
storageRepoWrite(), strNewFmt(STORAGE_REPO_BACKUP "/%s/" BACKUP_MANIFEST_FILE INFO_COPY_EXT, strPtr(removeBackupLabel)));
// Remove the backup from the info file
infoBackupDataDelete(infoBackup, removeBackupLabel);

4
src/command/stanza/delete.c
View File

@ -38,10 +38,10 @@ manifestDelete(const Storage *storageRepoWriteStanza)
for (unsigned int idx = 0; idx < strLstSize(backupList); idx++)
{
storageRemoveNP(
storageRepoWriteStanza, strNewFmt(STORAGE_REPO_BACKUP "/%s/" MANIFEST_FILE, strPtr(strLstGet(backupList, idx))));
storageRepoWriteStanza, strNewFmt(STORAGE_REPO_BACKUP "/%s/" BACKUP_MANIFEST_FILE, strPtr(strLstGet(backupList, idx))));
storageRemoveNP(
storageRepoWriteStanza,
strNewFmt(STORAGE_REPO_BACKUP "/%s/" MANIFEST_FILE INFO_COPY_EXT, strPtr(strLstGet(backupList, idx))));
strNewFmt(STORAGE_REPO_BACKUP "/%s/" BACKUP_MANIFEST_FILE INFO_COPY_EXT, strPtr(strLstGet(backupList, idx))));
}
FUNCTION_TEST_RETURN_VOID();

2
src/info/manifest.h
View File

@ -7,6 +7,6 @@ Manifest Handler
/***********************************************************************************************************************************
Constants
***********************************************************************************************************************************/
#define MANIFEST_FILE "backup.manifest"
#define BACKUP_MANIFEST_FILE "backup.manifest"
#endif

4
test/src/module/command/expireTest.c
View File

@ -169,12 +169,12 @@ testRun(void)
TEST_RESULT_VOID(
storagePutNP(
storageNewWriteNP(storageTest, strNewFmt("%s/%s", strPtr(full1Path), MANIFEST_FILE)), BUFSTRDEF(BOGUS_STR)),
storageNewWriteNP(storageTest, strNewFmt("%s/%s", strPtr(full1Path), BACKUP_MANIFEST_FILE)), BUFSTRDEF(BOGUS_STR)),
"full1 put manifest");
TEST_RESULT_VOID(
storagePutNP(
storageNewWriteNP(
storageTest, strNewFmt("%s/%s", strPtr(full1Path), MANIFEST_FILE ".copy")), BUFSTRDEF(BOGUS_STR)),
storageTest, strNewFmt("%s/%s", strPtr(full1Path), BACKUP_MANIFEST_FILE ".copy")), BUFSTRDEF(BOGUS_STR)),
"full1 put manifest copy");
TEST_RESULT_VOID(
storagePutNP(storageNewWriteNP(storageTest, strNewFmt("%s/%s", strPtr(full1Path), "bogus")),