encounter/MWCC
1
0
Fork 0
mirror of https://git.wuffs.org/MWCC synced 2025-12-12 14:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

more cleanup

Browse Source
This commit is contained in:
Ash Wolf
2023-01-15 21:50:41 +00:00
parent 35d488e972
commit a231f5dbb9
35 changed files with 1948 additions and 422 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command_line/CmdLine/Project/Resources/CLErrors.r
View File

@@ -1,4 +1,4 @@
static const char *STR12000[112] = {
static const char *STR12000[108] = {
"Could not get current working directory",
"Cannot find my executable '%s'",
"Could not initialize plugin '%s'",

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

@@ -267,7 +267,7 @@ int Deps_ChangeSpecialAccessPath(OSSpec *srcfss, Boolean initialize) {
specialAccessPath = FindOrAddGlobalInclPath(gTarg->incls.allPaths, pathspecptr);
if (optsCmdLine.verbose > 2)
CLReport(105, OS_PathSpecToString(pathspecptr, STSbuf, sizeof(STSbuf)));
CLReport(CLStr105, OS_PathSpecToString(pathspecptr, STSbuf, sizeof(STSbuf)));
return 1;
}

92
command_line/CmdLine/Src/CLFileOps.c
View File

@@ -13,7 +13,7 @@ static int OutputTextData(File *file, SInt16 stage, OSType maccreator, OSType ma
ret = ShowHandle(file->textdata, size, 0);
} else {
if (optsCmdLine.verbose)
CLReport(15, OS_SpecToStringRelative(&file->outfss, NULL, STSbuf, sizeof(STSbuf)));
CLReport(CLStr15, OS_SpecToStringRelative(&file->outfss, NULL, STSbuf, sizeof(STSbuf)));
ret = WriteHandleToFile(&file->outfss, file->textdata, size, maccreator, mactype);
file->wroteToDisk |= stage;
}
@@ -145,7 +145,7 @@ int GetOutputFile(File *file, SInt16 stage) {
if (!err) {
if (OS_EqualSpec(&file->srcfss, &file->outfss)) {
if (specifiedName) {
CLReportError(102, targetoutfilename);
CLReportError(CLStr102, targetoutfilename);
file->writeToDisk &= ~stage;
file->tempOnDisk &= ~stage;
return 0;
@@ -170,7 +170,7 @@ static int PreprocessFile(File *file) {
const CWObjectFlags *cof;
if (!(file->dropinflags & kCanpreprocess)) {
CLReportWarning(53, Plugin_GetDropInName(file->compiler), file->srcfilename);
CLReportWarning(CLStr53, Plugin_GetDropInName(file->compiler), file->srcfilename);
return 1;
}
@@ -188,7 +188,7 @@ static int PreprocessFile(File *file) {
optsCompiler.ppFileType ? optsCompiler.ppFileType : cof->ppFileType);
}
CLReportError(96, "preprocessing", file->srcfilename);
CLReportError(CLStr96, "preprocessing", file->srcfilename);
return 0;
}
@@ -228,7 +228,7 @@ static int RecordBrowseInfo(File *file) {
return 1;
if (!file->browsedata) {
CLReportError(101, Plugin_GetDropInName(file->compiler), OS_SpecToStringRelative(&file->srcfss, NULL, STSbuf, sizeof(STSbuf)));
CLReportError(CLStr101, Plugin_GetDropInName(file->compiler), OS_SpecToStringRelative(&file->srcfss, NULL, STSbuf, sizeof(STSbuf)));
return 0;
}
@@ -278,7 +278,7 @@ static int CompileFile(File *file) {
int ret = 1;
if (!(file->dropinflags & kCanprecompile) && ((optsCompiler.forcePrecompile == 1) || (file->mappingflags & kPrecompile))) {
CLReportWarning(54, Plugin_GetDropInName(file->compiler), file->srcfilename);
CLReportWarning(CLStr54, Plugin_GetDropInName(file->compiler), file->srcfilename);
return 1;
}
@@ -294,7 +294,7 @@ static int CompileFile(File *file) {
file->recordbrowseinfo = ret < 0;
file->browseFileID = id;
if (optsCmdLine.verbose > 1)
CLReport(22, file->srcfilename, file->browseFileID);
CLReport(CLStr22, file->srcfilename, file->browseFileID);
} else {
memset(file->browseoptions, 0, sizeof(file->browseoptions));
file->recordbrowseinfo = 0;
@@ -306,7 +306,7 @@ static int CompileFile(File *file) {
ret = 0;
} else {
if ((!file->hasobjectcode || !file->objectdata) && (file->dropinflags & kGeneratescode) && (file->objectUsage & 2)) {
CLReportError(96, "compiling", file->srcfilename);
CLReportError(CLStr96, "compiling", file->srcfilename);
ret = 0;
} else if (optsCmdLine.state == OptsCmdLineState_2 && !StoreObjectFile(file)) {
ret = 0;
@@ -334,7 +334,7 @@ static int DisassembleFile(File *file) {
Plugin *disasm;
if (!file->hasobjectcode && !file->hasresources) {
CLReportError(56, file->srcfilename);
CLReportError(CLStr56, file->srcfilename);
return 0;
}
@@ -352,7 +352,7 @@ static int DisassembleFile(File *file) {
optsCompiler.disFileCreator ? optsCompiler.disFileCreator : cof->disFileCreator,
optsCompiler.disFileType ? optsCompiler.disFileType : cof->disFileType);
}
CLReportError(96, "disassembling", file->srcfilename);
CLReportError(CLStr96, "disassembling", file->srcfilename);
return 0;
} else {
@@ -370,7 +370,7 @@ static int DisassembleFile(File *file) {
optsCompiler.disFileCreator ? optsCompiler.disFileCreator : cof->disFileCreator,
optsCompiler.disFileType ? optsCompiler.disFileType : cof->disFileType);
}
CLReportError(96, "disassembling", file->srcfilename);
CLReportError(CLStr96, "disassembling", file->srcfilename);
}
return 0;
}
@@ -383,15 +383,15 @@ static int DisassembleFile(File *file) {
optsCompiler.disFileCreator ? optsCompiler.disFileCreator : cof->disFileCreator,
optsCompiler.disFileType ? optsCompiler.disFileType : cof->disFileType);
}
CLReportError(96, "disassembling", file->srcfilename);
CLReportError(CLStr96, "disassembling", file->srcfilename);
}
return 0;
}
if (gTarg->linker)
CLReportError(58, Plugin_GetDropInName(gTarg->linker), Plugin_GetDropInName(file->compiler), file->srcfilename);
CLReportError(CLStr58, Plugin_GetDropInName(gTarg->linker), Plugin_GetDropInName(file->compiler), file->srcfilename);
else
CLReportError(57, Plugin_GetDropInName(file->compiler), file->srcfilename);
CLReportError(CLStr57, Plugin_GetDropInName(file->compiler), file->srcfilename);
return 0;
}
@@ -437,10 +437,10 @@ static int CompileEntry(File *file, Boolean *compiled) {
const char *cun;
const char *dun;
const char *uun;
CLReport(25, file->compiledlines);
CLReport(CLStr25, file->compiledlines);
tinfo->linesCompiled += file->compiledlines;
cun = dun = uun = "bytes";
CLReport(26, file->codesize, cun, file->idatasize, dun, file->udatasize, uun);
CLReport(CLStr26, file->codesize, cun, file->idatasize, dun, file->udatasize, uun);
}
tinfo->codeSize += file->codesize;
tinfo->iDataSize += file->idatasize;
@@ -451,9 +451,9 @@ static int CompileEntry(File *file, Boolean *compiled) {
if (optsCmdLine.timeWorking) {
if (optsCmdLine.verbose)
CLReport(24, (endWork - beginWork) / 1000.0, "compile", "", "", "");
CLReport(CLStr24, (endWork - beginWork) / 1000.0, "compile", "", "", "");
else
CLReport(24, (endWork - beginWork) / 1000.0, "compile", "'", file->srcfilename, "'");
CLReport(CLStr24, (endWork - beginWork) / 1000.0, "compile", "'", file->srcfilename, "'");
}
return 1;
@@ -463,16 +463,16 @@ static void DumpFileAndPathInfo(void) {
int i;
int n;
CLReport(84, "Framework search paths ([d] = default, [r] = recursive)");
CLReport(CLStr84, "Framework search paths ([d] = default, [r] = recursive)");
n = Paths_Count(&FrameworkPaths);
if (!n) {
CLReport(85, "(none)", "");
CLReport(CLStr85, "(none)", "");
} else {
for (i = 0; i < n; i++) {
Path *path = Paths_GetPath(&FrameworkPaths, i);
OS_ASSERT(961, path != NULL);
CLReport(85,
CLReport(CLStr85,
OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
((path->flags & 2) && path->recursive) ? " [d] [r]" : (path->flags & 2) ? " [d]" : path->recursive ? " [r]" : ""
);
@@ -482,7 +482,7 @@ static void DumpFileAndPathInfo(void) {
for (j = 0; j < Paths_Count(path->recursive); j++) {
Path *sub = Paths_GetPath(path->recursive, j);
OS_ASSERT(976, sub);
CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
CLReport(CLStr85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
}
}
}
@@ -490,7 +490,7 @@ static void DumpFileAndPathInfo(void) {
n = Frameworks_GetCount();
if (Frameworks_GetCount()) {
CLReport(84, "Included frameworks");
CLReport(CLStr84, "Included frameworks");
for (i = 0; i < n; i++) {
char version[80];
Paths_FWInfo *info = Frameworks_GetInfo(i);
@@ -504,23 +504,23 @@ static void DumpFileAndPathInfo(void) {
strncat(version, info->version.s, sizeof(version) - 4);
strcat(version, ")");
}
CLReport(85, info->name.s, version);
CLReport(CLStr85, info->name.s, version);
}
}
if (clState.plugintype == CWDROPINCOMPILERTYPE)
CLReport(84, "User include search paths ([d] = default, [r] = recursive)");
CLReport(CLStr84, "User include search paths ([d] = default, [r] = recursive)");
else
CLReport(84, "Library search paths ([d] = default, [r] = recursive)");
CLReport(CLStr84, "Library search paths ([d] = default, [r] = recursive)");
if (!Paths_Count(&gTarg->userPaths) && clState.plugintype == CWDROPINCOMPILERTYPE) {
CLReport(85, "(none)", "");
CLReport(CLStr85, "(none)", "");
} else {
for (i = 0; i < Paths_Count(&gTarg->userPaths); i++) {
Path *path = Paths_GetPath(&gTarg->userPaths, i);
OS_ASSERT(1024, path != NULL);
CLReport(85,
CLReport(CLStr85,
OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
((path->flags & 2) && path->recursive) ? " [d] [r]" : (path->flags & 2) ? " [d]" : path->recursive ? " [r]" : ""
);
@@ -530,23 +530,23 @@ static void DumpFileAndPathInfo(void) {
for (j = 0; j < Paths_Count(path->recursive); j++) {
Path *sub = Paths_GetPath(path->recursive, j);
OS_ASSERT(1039, sub);
CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
CLReport(CLStr85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
}
}
}
}
if (clState.plugintype == CWDROPINCOMPILERTYPE)
CLReport(84, "System include search paths ([d] = default, [r] = recursive)");
CLReport(CLStr84, "System include search paths ([d] = default, [r] = recursive)");
if (!Paths_Count(&gTarg->sysPaths))
CLReport(85, "(none)", "");
CLReport(CLStr85, "(none)", "");
for (i = 0; i < Paths_Count(&gTarg->sysPaths); i++) {
Path *path = Paths_GetPath(&gTarg->sysPaths, i);
OS_ASSERT(1054, path != NULL);
CLReport(85,
CLReport(CLStr85,
OS_PathSpecToString(path->spec, STSbuf, sizeof(STSbuf)),
((path->flags & 2) && path->recursive) ? " [d] [r]" : (path->flags & 2) ? " [d]" : path->recursive ? " [r]" : ""
);
@@ -556,22 +556,22 @@ static void DumpFileAndPathInfo(void) {
for (j = 0; j < Paths_Count(path->recursive); j++) {
Path *sub = Paths_GetPath(path->recursive, j);
OS_ASSERT(1069, sub);
CLReport(85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
CLReport(CLStr85, "\t", OS_PathSpecToString(sub->spec, STSbuf, sizeof(STSbuf)));
}
}
}
if (clState.plugintype == CWDROPINCOMPILERTYPE)
CLReport(84, "Files in project (relative to CWD)");
CLReport(CLStr84, "Files in project (relative to CWD)");
else
CLReport(84, "Link order for project (relative to CWD)");
CLReport(CLStr84, "Link order for project (relative to CWD)");
for (i = 0; i < Files_Count(&gTarg->files); i++) {
File *file = Files_GetFile(&gTarg->files, i);
if (!VFiles_Find(gTarg->virtualFiles, file->srcfilename))
CLReport(85, OS_SpecToStringRelative(&file->srcfss, NULL, STSbuf, sizeof(STSbuf)), "");
CLReport(CLStr85, OS_SpecToStringRelative(&file->srcfss, NULL, STSbuf, sizeof(STSbuf)), "");
else
CLReport(85, file->srcfilename, "\t(virtual file)");
CLReport(CLStr85, file->srcfilename, "\t(virtual file)");
}
}
@@ -655,16 +655,16 @@ int CompileFilesInProject(void) {
const char *dun;
const char *uun;
cun = dun = uun = "bytes";
CLReport(27, tinfo->codeSize, cun, tinfo->iDataSize, dun, tinfo->uDataSize, uun);
CLReport(CLStr27, tinfo->codeSize, cun, tinfo->iDataSize, dun, tinfo->uDataSize, uun);
}
endTime = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (endTime - startTime) / 1000.0, "compile", "", "", "project");
CLReport(CLStr24, (endTime - startTime) / 1000.0, "compile", "", "", "project");
if (ignored > 0 && compiled == 0 && (gTarg->preLinker || gTarg->linker))
CLReportError(29);
CLReportError(CLStr29);
if (failed)
return Result_Failed;
@@ -696,7 +696,7 @@ static int PostLinkFilesInProject(void) {
endTime = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (endTime - startTime) / 1000.0, "compile", "", "", "project");
CLReport(CLStr24, (endTime - startTime) / 1000.0, "compile", "", "", "project");
return CheckForUserBreak() ? Result_Cancelled : Result_Success;
}
@@ -726,7 +726,7 @@ int LinkProject(void) {
subEnd = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (subEnd - subStart) / 1000.0, "prelink project", "", "", "");
CLReport(CLStr24, (subEnd - subStart) / 1000.0, "prelink project", "", "", "");
}
if (gTarg->linker && optsLinker.callLinker && optsCmdLine.state == OptsCmdLineState_3) {
@@ -744,7 +744,7 @@ int LinkProject(void) {
subEnd = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (subEnd - subStart) / 1000.0, "link project", "", "", "");
CLReport(CLStr24, (subEnd - subStart) / 1000.0, "link project", "", "", "");
}
if (gTarg->postLinker && optsLinker.callPostLinker && optsCmdLine.state == OptsCmdLineState_3) {
@@ -772,12 +772,12 @@ int LinkProject(void) {
subEnd = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (subEnd - subStart) / 1000.0, "postlink project", "", "", "");
CLReport(CLStr24, (subEnd - subStart) / 1000.0, "postlink project", "", "", "");
if (!optsLinker.keepLinkerOutput && gTarg->targetinfo->outputType == linkOutputFile) {
if (optsCmdLine.verbose > 1) {
OS_FSSpec_To_OSSpec(&fss, &outfile);
CLReport(19, OS_SpecToString(&outfile, STSbuf, sizeof(STSbuf)));
CLReport(CLStr19, OS_SpecToString(&outfile, STSbuf, sizeof(STSbuf)));
}
FSpDelete(&fss);
}
@@ -789,7 +789,7 @@ int LinkProject(void) {
endTime = OS_GetMilliseconds();
if (optsCmdLine.timeWorking)
CLReport(24, (endTime - startTime) / 1000.0, "finish link stage", "", "", "");
CLReport(CLStr24, (endTime - startTime) / 1000.0, "finish link stage", "", "", "");
return Result_Success;
}

26
command_line/CmdLine/Src/CLMain.c
View File

@@ -253,7 +253,7 @@ int Main_Initialize(int argc, char **argv) {
}
if (OS_FindProgram(exename, &clState.programSpec))
CLReportError(2, exename);
CLReportError(CLStr2, exename);
Plugins_Init();
if (!RegisterStaticCmdLinePlugin())
@@ -387,7 +387,7 @@ static int Main_ResolveProject(void) {
endTime = LMGetTicks();
if (optsCmdLine.timeWorking) {
CLReport(24, (endTime - startTime) / 60.0, "resolve", "", "project", "");
CLReport(CLStr24, (endTime - startTime) / 60.0, "resolve", "", "project", "");
}
return 0;
@@ -399,7 +399,7 @@ static int UpdatePCmdLineFromVersion(PCmdLine *given, PCmdLine *target) {
*target = *given;
if (clState.pluginDebug && version < 0x1002 && !warned) {
CLReportWarning(104, "CmdLine Panel");
CLReportWarning(CLStr104, "CmdLine Panel");
warned = 1;
}
@@ -414,7 +414,7 @@ static int UpdatePCmdLineFromVersion(PCmdLine *given, PCmdLine *target) {
}
if (version < 0x1000 || version > 0x1002) {
CLReportError(104, "CmdLine Panel");
CLReportError(CLStr104, "CmdLine Panel");
return 0;
} else {
target->version = 0x1002;
@@ -427,7 +427,7 @@ static int UpdatePCmdLineEnvirFromVersion(PCmdLineEnvir *given, PCmdLineEnvir *t
*target = *given;
if ((clState.pluginDebug && version < 0x1000) || version > 0x1000) {
CLReportError(104, "CmdLine Environment");
CLReportError(CLStr104, "CmdLine Environment");
return 0;
} else {
target->version = 0x1000;
@@ -441,7 +441,7 @@ static int UpdatePCmdLineCompilerFromVersion(PCmdLineCompiler *given, PCmdLineCo
*target = *given;
if (clState.pluginDebug && version < 0x1005 && !warned) {
CLReportWarning(104, "CmdLine Compiler Panel");
CLReportWarning(CLStr104, "CmdLine Compiler Panel");
warned = 1;
}
@@ -468,7 +468,7 @@ static int UpdatePCmdLineCompilerFromVersion(PCmdLineCompiler *given, PCmdLineCo
}
if (version <= 0x1000 || version > 0x1005) {
CLReportError(104, "CmdLine Compiler Panel");
CLReportError(CLStr104, "CmdLine Compiler Panel");
return 0;
} else {
target->version = 0x1005;
@@ -482,7 +482,7 @@ static int UpdatePCmdLineLinkerFromVersion(PCmdLineLinker *given, PCmdLineLinker
*target = *given;
if (clState.pluginDebug && version < 0x1002 && !warned) {
CLReportWarning(104, "CmdLine Linker Panel");
CLReportWarning(CLStr104, "CmdLine Linker Panel");
warned = 1;
}
@@ -499,7 +499,7 @@ static int UpdatePCmdLineLinkerFromVersion(PCmdLineLinker *given, PCmdLineLinker
}
if (version < 0x1000 || version > 0x1002) {
CLReportError(104, "CmdLine Linker Panel");
CLReportError(CLStr104, "CmdLine Linker Panel");
return 0;
} else {
target->version = 0x1002;
@@ -518,7 +518,7 @@ static int UpdatePrefPanels(const char *name) {
return 0;
}
} else {
CLReportError(91, "CmdLine Panel");
CLReportError(CLStr91, "CmdLine Panel");
return 0;
}
}
@@ -530,7 +530,7 @@ static int UpdatePrefPanels(const char *name) {
return 0;
}
} else {
CLReportError(91, "CmdLine Environment");
CLReportError(CLStr91, "CmdLine Environment");
return 0;
}
}
@@ -542,7 +542,7 @@ static int UpdatePrefPanels(const char *name) {
return 0;
}
} else {
CLReportError(91, "CmdLine Compiler Panel");
CLReportError(CLStr91, "CmdLine Compiler Panel");
return 0;
}
}
@@ -554,7 +554,7 @@ static int UpdatePrefPanels(const char *name) {
return 0;
}
} else {
CLReportError(91, "CmdLine Linker Panel");
CLReportError(CLStr91, "CmdLine Linker Panel");
return 0;
}
}

2
command_line/CmdLine/Src/CLPrefs.c
View File

@@ -98,7 +98,7 @@ Boolean Prefs_AddPanel(PrefPanel *panel) {
for (scan = &panellist; *scan; scan = &(*scan)->next) {
if (!strcmp((*scan)->name, panel->name)) {
CLReportError(90, panel->name);
CLReportError(CLStr90, panel->name);
return 0;
}
}

16
command_line/CmdLine/Src/CLToolExec.c
View File

@@ -125,7 +125,7 @@ int DeleteTemporaries(void) {
if ((file->objectUsage & CmdLineStageMask_Cg) && (file->tempOnDisk & CmdLineStageMask_Cg) && (file->wroteToDisk & CmdLineStageMask_Cg)) {
GetOutputFile(file, CmdLineStageMask_Cg);
if (optsCmdLine.verbose > 1)
CLReport(19, OS_SpecToString(&file->outfss, STSbuf, sizeof(STSbuf)));
CLReport(CLStr19, OS_SpecToString(&file->outfss, STSbuf, sizeof(STSbuf)));
OS_Delete(&file->outfss);
file->tempOnDisk &= ~CmdLineStageMask_Cg;
file->wroteToDisk &= ~CmdLineStageMask_Cg;
@@ -190,13 +190,13 @@ int ExecuteLinker(Plugin *plugin, SInt32 dropinflags, File *file, char *stdoutfi
if (!OS_FindProgram(cname, &linkerspec)) {
ptr = cname;
if (optsCompiler.linkerName[0]) {
CLReportWarning(66, linkertype, optsCompiler.linkerName);
CLReport(65, ptr, clState.programName);
CLReportWarning(CLStr66, linkertype, optsCompiler.linkerName);
CLReport(CLStr65, ptr, clState.programName);
} else if (optsCmdLine.verbose) {
CLReport(65, ptr, clState.programName);
CLReport(CLStr65, ptr, clState.programName);
}
} else {
CLReportError(66, linkertype, linkername);
CLReportError(CLStr66, linkertype, linkername);
return 0;
}
}
@@ -221,15 +221,15 @@ int ExecuteLinker(Plugin *plugin, SInt32 dropinflags, File *file, char *stdoutfi
fflush(stderr);
if (optsCmdLine.verbose)
CLReport(67, linkertype, OS_SpecToString(&linkerspec, STSbuf, sizeof(STSbuf)));
CLReport(CLStr67, linkertype, OS_SpecToString(&linkerspec, STSbuf, sizeof(STSbuf)));
if (!optsCmdLine.dryRun) {
execerr = OS_Execute(&linkerspec, args.argv, args.envp, stdoutfile, stderrfile, &exitcode);
if (execerr) {
CLReportError(68, linkertype, args.argv[0], OS_GetErrText(execerr));
CLReportError(CLStr68, linkertype, args.argv[0], OS_GetErrText(execerr));
ret = 0;
} else if (exitcode) {
CLReportError(69 /*nice*/, linkertype, args.argv[0], exitcode);
CLReportError(CLStr69, linkertype, args.argv[0], exitcode);
ret = 0;
}
}

4
command_line/CmdLine/Src/CLWriteObjectFile.c
View File

@@ -12,7 +12,7 @@ int WriteObjectFile(File *file, OSType maccreator, OSType mactype) {
OS_OSSpec_To_FSSpec(&file->srcfss, &srcfss);
if (optsCmdLine.verbose) {
CLReport(16,
CLReport(CLStr16,
(file->tempOnDisk & CmdLineStageMask_Cg) ? "temporary " : "",
OS_SpecToStringRelative(&file->outfss, NULL, STSbuf, sizeof(STSbuf)));
}
@@ -33,7 +33,7 @@ int WriteBrowseData(File *file, OSType maccreator, OSType mactype) {
OS_NameSpecSetExtension(&outfss.name, optsCompiler.brsFileExt[0] ? optsCompiler.brsFileExt : cof->brsFileExt);
if (optsCmdLine.verbose) {
CLReport(17, OS_SpecToStringRelative(&outfss, NULL, STSbuf, sizeof(STSbuf)));
CLReport(CLStr17, OS_SpecToStringRelative(&outfss, NULL, STSbuf, sizeof(STSbuf)));
}
if (!Browser_PackBrowseFile(file->browsedata, &clState.browseTableHandle, &browsehandle))

4
command_line/CmdLine/Src/Callbacks/CLDropinCallbacks_V10.cpp
View File

@@ -623,11 +623,11 @@ CWResult UCBGetNamedPreferences(CWPluginContext context, const char *prefsname,
PrefPanel *pnl = Prefs_FindPanel(prefsname);
if (pnl) {
if (optsCmdLine.verbose > 2)
CLReport(83, prefsname);
CLReport(CLStr83, prefsname);
UCBSecretAttachHandle(context, PrefPanel_GetHandle(pnl), prefsdata);
return cwNoErr;
} else {
CLReportError(91, prefsname);
CLReportError(CLStr91, prefsname);
*prefsdata = NULL;
return cwErrRequestFailed;
}

4
command_line/CmdLine/Src/Envir/CLErrors.c
View File

@@ -59,7 +59,7 @@ void CLReportOSError(SInt16 errid, int err, ...) {
va_end(va);
oserr = OS_GetErrText(err);
CLReportError(99, txt, oserr, err);
CLReportError(CLStr99, txt, oserr, err);
if (txt != mybuf)
free(txt);
@@ -77,7 +77,7 @@ void CLReportCError(SInt16 errid, int err_no, ...) {
va_end(va);
serr = strerror(err_no);
CLReportError(100, txt, serr, err_no);
CLReportError(CLStr100, txt, serr, err_no);
if (txt != mybuf)
free(txt);

8
command_line/CmdLine/Src/Envir/CLIO.c
View File

@@ -240,7 +240,7 @@ void TermWorking(void) {
static void ProgressFunction(const char *functionname) {
if (optsCmdLine.verbose)
CLReport(7, functionname);
CLReport(CLStr7, functionname);
}
Boolean CheckForUserBreak(void) {
@@ -881,10 +881,10 @@ SInt16 CLStyledMessageDispatch(Plugin *plugin, MessageRef *ref, SInt32 errorNumb
if (++clState.countErrors >= optsCmdLine.maxErrors) {
clState.withholdErrors = 1;
if (!optsCompiler.noFail) {
CLReport(70);
CLReport(CLStr70);
clState.userBreak = 1;
} else {
CLReport(71);
CLReport(CLStr71);
}
}
}
@@ -892,7 +892,7 @@ SInt16 CLStyledMessageDispatch(Plugin *plugin, MessageRef *ref, SInt32 errorNumb
if (msgType == Msg_Warning && optsCmdLine.maxWarnings) {
if (++clState.countWarnings >= optsCmdLine.maxWarnings) {
clState.withholdWarnings = 1;
CLReport(72);
CLReport(CLStr72);
}
}

18
command_line/CmdLine/Src/Plugins/CLPlugins.c
View File

@@ -400,7 +400,7 @@ static Boolean VerifyPanels(Plugin *pl) {
if (pl->cb->GetPanelList && pl->cb->GetPanelList(&pls) == 0) {
for (idx = 0; idx < pls->count; idx++) {
if (Prefs_FindPanel(pls->names[idx]) == NULL) {
CLReportError(91, pls->names[idx]);
CLReportError(CLStr91, pls->names[idx]);
failed = 1;
}
}
@@ -460,7 +460,7 @@ void Plugin_Free(Plugin *pl) {
Boolean Plugin_VerifyPanels(Plugin *pl) {
if (!VerifyPanels(pl)) {
CLReportError(92, Plugin_GetDropInName(pl));
CLReportError(CLStr92, Plugin_GetDropInName(pl));
return 0;
} else {
return 1;
@@ -511,14 +511,14 @@ int Plugins_Add(Plugin *pl) {
pl->cached_ascii_version = Plugin_GetVersionInfoASCII(pl);
if (!SupportedPlugin(pl, &failreason)) {
CLReportError(88, dropinname, pl->cached_ascii_version, failreason);
CLReportError(CLStr88, dropinname, pl->cached_ascii_version, failreason);
return 0;
}
scan = &pluginlist;
while (*scan) {
if (Plugin_MatchesName(*scan, dropinname)) {
CLReportError(89, dropinname);
CLReportError(CLStr89, dropinname);
return 0;
}
scan = &(*scan)->next;
@@ -528,14 +528,14 @@ int Plugins_Add(Plugin *pl) {
df = Plugin_GetDropInFlags(pl);
if (!(df->dropinflags & dropInExecutableTool) && !SendInitOrTermRequest(pl, 1)) {
CLReportError(3, dropinname);
CLReportError(CLStr3, dropinname);
return 0;
}
if (df->dropintype == CWDROPINCOMPILERTYPE && df->dropinflags & 0x17C000)
CLReportError(4, "compiler", dropinname);
CLReportError(CLStr4, "compiler", dropinname);
if (df->dropintype == CWDROPINLINKERTYPE && df->dropinflags & 0x5FE4000)
CLReportError(4, "linker", dropinname);
CLReportError(CLStr4, "linker", dropinname);
if (clState.pluginDebug) {
vislang = df->edit_language ? df->edit_language : CWFOURCHAR('-','-','-','-');
@@ -816,11 +816,11 @@ Plugin *Plugins_GetParserForPlugin(Plugin *list, OSType style, int numPlugins, C
if (pick && !allpanels) {
int idx;
CLReport(5);
CLReport(CLStr5);
for (idx = 0; idx < numPanels; idx++) {
if (!supports[idx])
CLReport(6, panelNames[idx]);
CLReport(CLStr6, panelNames[idx]);
}
}

4
command_line/CmdLine/Src/Project/CLAccessPaths.c
View File

@@ -463,13 +463,13 @@ void Framework_GetEnvInfo(void) {
if (path[0]) {
if (strlen(path) >= sizeof(path)) {
CLReportError(64, sizeof(path), path);
CLReportError(CLStr64, sizeof(path), path);
} else {
err = OS_MakeSpec(path, &spec, &is_file);
if (!is_file && !err) {
Frameworks_AddPath(&spec.path);
} else {
CLReportError(23, path);
CLReportError(CLStr23, path);
}
}
}