From dd927a94568b65a5f3bf3f20495441dd3c915a09 Mon Sep 17 00:00:00 2001 From: Mark Vitale Date: Fri, 5 May 2023 13:00:41 -0400 Subject: [PATCH] util: Remove duplicate path definitions Commit f896be7dd587 dirpath-mrafs-additions-20010212 inadvertently introduced duplicate entries for several AFS path definitions via a cut-and-paste mistake. Remove the duplicate definitions. While here, move a server definition into the correct category. No functional change is incurred by this commit. Change-Id: Icf88ee9f74f8a7c72cd7cd2abf8b128f5651f4b5 Reviewed-on: https://gerrit.openafs.org/15420 Tested-by: BuildBot Reviewed-by: Cheyenne Wills Reviewed-by: Michael Meffie --- src/util/dirpath.hin | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/util/dirpath.hin b/src/util/dirpath.hin index ee8c39c43a..4f4dbcf9f6 100644 --- a/src/util/dirpath.hin +++ b/src/util/dirpath.hin @@ -315,17 +315,15 @@ const char *afs_getDirPath(afsdir_id_t string_id); #define AFSDIR_SERVER_LOGS_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOGS_DIRPATH_ID) #define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) #define AFSDIR_SERVER_BACKUP_DIRPATH afs_getDirPath(AFSDIR_SERVER_BACKUP_DIRPATH_ID) -#define AFSDIR_SERVER_LOCAL_DIRPATH afs_getDirPath(AFSDIR_SERVER_LOCAL_DIRPATH_ID) -#define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) #define AFSDIR_SERVER_MIGRATE_DIRPATH afs_getDirPath(AFSDIR_SERVER_MIGRATE_DIRPATH_ID) /* client subdir paths */ #define AFSDIR_CLIENT_VICE_DIRPATH afs_getDirPath(AFSDIR_CLIENT_VICE_DIRPATH_ID) #define AFSDIR_CLIENT_ETC_DIRPATH afs_getDirPath(AFSDIR_CLIENT_ETC_DIRPATH_ID) #define AFSDIR_CLIENT_DATA_DIRPATH afs_getDirPath(AFSDIR_CLIENT_DATA_DIRPATH_ID) -#define AFSDIR_SERVER_BIN_FILE_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) /* server file paths */ +#define AFSDIR_SERVER_BIN_FILE_DIRPATH afs_getDirPath(AFSDIR_SERVER_BIN_FILE_DIRPATH_ID) #define AFSDIR_SERVER_THISCELL_FILEPATH afs_getDirPath(AFSDIR_SERVER_THISCELL_FILEPATH_ID) #define AFSDIR_SERVER_CELLSERVDB_FILEPATH afs_getDirPath(AFSDIR_SERVER_CELLSERVDB_FILEPATH_ID) #define AFSDIR_SERVER_NOAUTH_FILEPATH afs_getDirPath(AFSDIR_SERVER_NOAUTH_FILEPATH_ID)