From 3f18040aab5707c9be9b51fe37f3464d222fceb5 Mon Sep 17 00:00:00 2001 From: David Steele Date: Fri, 20 Sep 2019 08:13:36 -0400 Subject: [PATCH] Rename MANIFEST_FILE to BACKUP_MANIFEST_FILE. This is a bit more descriptive and avoids a naming conflict in the new C manifest code. --- src/command/expire/expire.c | 4 ++-- src/command/stanza/delete.c | 4 ++-- src/info/manifest.h | 2 +- test/src/module/command/expireTest.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/command/expire/expire.c b/src/command/expire/expire.c index a5830a08a..6acae1e49 100644 --- a/src/command/expire/expire.c +++ b/src/command/expire/expire.c @@ -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); diff --git a/src/command/stanza/delete.c b/src/command/stanza/delete.c index 7361b6041..d3ce00688 100644 --- a/src/command/stanza/delete.c +++ b/src/command/stanza/delete.c @@ -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(); diff --git a/src/info/manifest.h b/src/info/manifest.h index 1becc1049..aaa09bc3d 100644 --- a/src/info/manifest.h +++ b/src/info/manifest.h @@ -7,6 +7,6 @@ Manifest Handler /*********************************************************************************************************************************** Constants ***********************************************************************************************************************************/ -#define MANIFEST_FILE "backup.manifest" +#define BACKUP_MANIFEST_FILE "backup.manifest" #endif diff --git a/test/src/module/command/expireTest.c b/test/src/module/command/expireTest.c index e871ab475..5b00807e7 100644 --- a/test/src/module/command/expireTest.c +++ b/test/src/module/command/expireTest.c @@ -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")),