encounter
/
MWCC
mirror of https://git.wuffs.org/MWCC
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

rename IncludeSearch enum names to match what they actually do

This commit is contained in:
Ash Wolf 2023-01-26 11:30:23 +00:00
parent 3d2f1da7c8
commit fc0c4c0df7
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
command_line/CmdLine/Src/CLDependencies.c
View File

@ -239,19 +239,19 @@ int Deps_ChangeSpecialAccessPath(OSSpec *srcfss, Boolean initialize) {
currentsrcfss = srcfss; currentsrcfss = srcfss;
switch (optsCompiler.includeSearch) { switch (optsCompiler.includeSearch) {
case IncludeSearch_Type2: case IncludeSearch_Explicit:
specialAccessPath = NULL; specialAccessPath = NULL;
return 1; return 1;
case IncludeSearch_Type0: case IncludeSearch_Proj:
if (!initialize) if (!initialize)
return 1; return 1;
OS_GetCWD(&pathspec); OS_GetCWD(&pathspec);
pathspecptr = &pathspec; pathspecptr = &pathspec;
break; break;
case IncludeSearch_Type1: case IncludeSearch_Source:
if (!initialize) if (!initialize)
return 1; return 1;
case IncludeSearch_Type3: case IncludeSearch_Include:
if (srcfss) { if (srcfss) {
pathspecptr = &srcfss->path; pathspecptr = &srcfss->path;
} else if (currentsrcfss) { } else if (currentsrcfss) {
@ -282,7 +282,7 @@ static void SetSpecialAccessPathFromIncludeStackTOS(void) {
char *fnameptr; char *fnameptr;
VFile *vf; VFile *vf;
if (optsCompiler.includeSearch == IncludeSearch_Type3 && CLT_filesp && CLT_filestack) { if (optsCompiler.includeSearch == IncludeSearch_Include && CLT_filesp && CLT_filestack) {
if (*CLT_filesp >= 0) { if (*CLT_filesp >= 0) {
index = *CLT_filesp; index = *CLT_filesp;
while (index) { while (index) {

9
includes/cmdline.h
View File

@ -487,11 +487,10 @@ enum {
}; };
enum { enum {
IncludeSearch_Type0 = 0, IncludeSearch_Proj = 0,
IncludeSearch_Type1 = 1, IncludeSearch_Source = 1,
IncludeSearch_Type2 = 2, IncludeSearch_Explicit = 2,
IncludeSearch_Type3 = 3, IncludeSearch_Include = 3
IncludeSearch_Type4 = 4
}; };
typedef struct PrefPanel PrefPanel; typedef struct PrefPanel PrefPanel;