From fc0c4c0df7b583b55a08317cf1ef6a71d27c0440 Mon Sep 17 00:00:00 2001 From: Ash Wolf Date: Thu, 26 Jan 2023 11:30:23 +0000 Subject: rename IncludeSearch enum names to match what they actually do --- command_line/CmdLine/Src/CLDependencies.c | 10 +++++----- includes/cmdline.h | 9 ++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/command_line/CmdLine/Src/CLDependencies.c b/command_line/CmdLine/Src/CLDependencies.c index 2292dfb..d242c85 100644 --- a/command_line/CmdLine/Src/CLDependencies.c +++ b/command_line/CmdLine/Src/CLDependencies.c @@ -239,19 +239,19 @@ int Deps_ChangeSpecialAccessPath(OSSpec *srcfss, Boolean initialize) { currentsrcfss = srcfss; switch (optsCompiler.includeSearch) { - case IncludeSearch_Type2: + case IncludeSearch_Explicit: specialAccessPath = NULL; return 1; - case IncludeSearch_Type0: + case IncludeSearch_Proj: if (!initialize) return 1; OS_GetCWD(&pathspec); pathspecptr = &pathspec; break; - case IncludeSearch_Type1: + case IncludeSearch_Source: if (!initialize) return 1; - case IncludeSearch_Type3: + case IncludeSearch_Include: if (srcfss) { pathspecptr = &srcfss->path; } else if (currentsrcfss) { @@ -282,7 +282,7 @@ static void SetSpecialAccessPathFromIncludeStackTOS(void) { char *fnameptr; VFile *vf; - if (optsCompiler.includeSearch == IncludeSearch_Type3 && CLT_filesp && CLT_filestack) { + if (optsCompiler.includeSearch == IncludeSearch_Include && CLT_filesp && CLT_filestack) { if (*CLT_filesp >= 0) { index = *CLT_filesp; while (index) { diff --git a/includes/cmdline.h b/includes/cmdline.h index 45f052e..363766e 100644 --- a/includes/cmdline.h +++ b/includes/cmdline.h @@ -487,11 +487,10 @@ enum { }; enum { - IncludeSearch_Type0 = 0, - IncludeSearch_Type1 = 1, - IncludeSearch_Type2 = 2, - IncludeSearch_Type3 = 3, - IncludeSearch_Type4 = 4 + IncludeSearch_Proj = 0, + IncludeSearch_Source = 1, + IncludeSearch_Explicit = 2, + IncludeSearch_Include = 3 }; typedef struct PrefPanel PrefPanel; -- cgit v1.2.3