reorganise things a bit to align further with the actual names/structure

24 files changed, 12 insertions, 17 deletions

diff --git a/unsorted/Arguments.c b/command_line/C++_Parser/Src/Library/Arguments.c
index 631f282..631f282 100644
--- a/unsorted/Arguments.c
+++ b/command_line/C++_Parser/Src/Library/Arguments.c
diff --git a/unsorted/Help.c b/command_line/C++_Parser/Src/Library/Help.c
index 74849a1..74849a1 100644
--- a/unsorted/Help.c
+++ b/command_line/C++_Parser/Src/Library/Help.c
diff --git a/unsorted/IO.c b/command_line/C++_Parser/Src/Library/IO.c
index 36d809b..36d809b 100644
--- a/unsorted/IO.c
+++ b/command_line/C++_Parser/Src/Library/IO.c
diff --git a/unsorted/OptimizerHelpers.c b/command_line/C++_Parser/Src/Library/OptimizerHelpers.c
index 4085363..4085363 100644
--- a/unsorted/OptimizerHelpers.c
+++ b/command_line/C++_Parser/Src/Library/OptimizerHelpers.c
diff --git a/unsorted/Option.c b/command_line/C++_Parser/Src/Library/Option.c
index 2a53f38..2a53f38 100644
--- a/unsorted/Option.c
+++ b/command_line/C++_Parser/Src/Library/Option.c
diff --git a/unsorted/Parameter.c b/command_line/C++_Parser/Src/Library/Parameter.c
index 31669e1..31669e1 100644
--- a/unsorted/Parameter.c
+++ b/command_line/C++_Parser/Src/Library/Parameter.c
diff --git a/unsorted/ParserErrors.c b/command_line/C++_Parser/Src/Library/ParserErrors.c
index df5e67e..df5e67e 100644
--- a/unsorted/ParserErrors.c
+++ b/command_line/C++_Parser/Src/Library/ParserErrors.c
diff --git a/unsorted/ParserFace.c b/command_line/C++_Parser/Src/Library/ParserFace.c
index a005ece..a005ece 100644
--- a/unsorted/ParserFace.c
+++ b/command_line/C++_Parser/Src/Library/ParserFace.c
diff --git a/unsorted/ParserHelpers-cc.c b/command_line/C++_Parser/Src/Library/ParserHelpers-cc.c
index 07315b3..07315b3 100644
--- a/unsorted/ParserHelpers-cc.c
+++ b/command_line/C++_Parser/Src/Library/ParserHelpers-cc.c
diff --git a/unsorted/ParserHelpers.c b/command_line/C++_Parser/Src/Library/ParserHelpers.c
index 4cb793e..4cb793e 100644
--- a/unsorted/ParserHelpers.c
+++ b/command_line/C++_Parser/Src/Library/ParserHelpers.c
diff --git a/unsorted/Projects.c b/command_line/C++_Parser/Src/Library/Projects.c
index dca9df2..dca9df2 100644
--- a/unsorted/Projects.c
+++ b/command_line/C++_Parser/Src/Library/Projects.c
diff --git a/unsorted/StaticParserGlue.c b/command_line/C++_Parser/Src/Library/StaticParserGlue.c
index 7a44487..7a44487 100644
--- a/unsorted/StaticParserGlue.c
+++ b/command_line/C++_Parser/Src/Library/StaticParserGlue.c
diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c b/command_line/C++_Parser/Src/Library/StdTargetWarningHelpers-cc.c
index db6165c..c1f378d 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c
+++ b/command_line/C++_Parser/Src/Library/StdTargetWarningHelpers-cc.c
@@ -1,8 +1,5 @@
 #include "parser.h"
 
-// I'm making assumptions about the name of this file
-// based on TargetWarningHelpers-ppc-ld.c existing in the linker
-
 PExtraWarningC pExtraWarningC = {0};
 Pragma warningPragmas[] = {
         &pExtraWarningC.warn_largeargs, "warn_largeargs", 0,
diff --git a/unsorted/Targets.c b/command_line/C++_Parser/Src/Library/Targets.c
index 378b9d7..378b9d7 100644
--- a/unsorted/Targets.c
+++ b/command_line/C++_Parser/Src/Library/Targets.c
diff --git a/unsorted/ToolHelpers-cc.c b/command_line/C++_Parser/Src/Library/ToolHelpers-cc.c
index b58f188..b58f188 100644
--- a/unsorted/ToolHelpers-cc.c
+++ b/command_line/C++_Parser/Src/Library/ToolHelpers-cc.c
diff --git a/unsorted/ToolHelpers.c b/command_line/C++_Parser/Src/Library/ToolHelpers.c
index e872546..e872546 100644
--- a/unsorted/ToolHelpers.c
+++ b/command_line/C++_Parser/Src/Library/ToolHelpers.c
diff --git a/unsorted/Utils.c b/command_line/C++_Parser/Src/Library/Utils.c
index b627c4d..b627c4d 100644
--- a/unsorted/Utils.c
+++ b/command_line/C++_Parser/Src/Library/Utils.c
diff --git a/command_line/CmdLine/Src/uFileTypeMappings.c b/command_line/CmdLine/Src/CLFileTypes.c
index 56aaea5..3416603 100644
--- a/command_line/CmdLine/Src/uFileTypeMappings.c
+++ b/command_line/CmdLine/Src/CLFileTypes.c
@@ -1,7 +1,5 @@
 #include "cmdline.h"
 
-// I don't actually have a name for this file, annoyingly enough
-
 void AddFileTypeMappingList(OSFileTypeMappings **list, const OSFileTypeMappingList *entry) {
     OS_AddFileTypeMappingList(list, entry);
 }
diff --git a/command_line/CmdLine/Src/Clients/CLStaticMain.c b/command_line/CmdLine/Src/Clients/CLStaticMain.c
index 871dcef..77910fe 100644
--- a/command_line/CmdLine/Src/Clients/CLStaticMain.c
+++ b/command_line/CmdLine/Src/Clients/CLStaticMain.c
@@ -4,16 +4,16 @@ extern const char *CMDLINE_BUILD_TIME;
 extern const char *CMDLINE_BUILD_DATE;
 
 // Glue functions
-extern int RegisterStaticParserPlugins();
-extern int RegisterStaticParserResources();
+extern int RegisterStaticParserPlugins(void);
+extern int RegisterStaticParserResources(void);
 
 extern void GetStaticTarget(OSType *cpu, OSType *os);
 extern void GetStaticPluginType(OSType *language, OSType *plugintype);
 extern void GetStaticParserPluginType(OSType *style);
-extern int RegisterStaticTargetResources();
-extern int RegisterStaticTargetPlugins();
+extern int RegisterStaticTargetResources(void);
+extern int RegisterStaticTargetPlugins(void);
 
-extern int RegisterStaticParserToolInfo();
+extern int RegisterStaticParserToolInfo(void);
 
 int main(int argc, char **argv) {
     OSType cpu;
diff --git a/unsorted/uCOS.c b/command_line/PluginLib/Src/Internal/COSToolsCLT.c
index 11f1668..11f1668 100644
--- a/unsorted/uCOS.c
+++ b/command_line/PluginLib/Src/Internal/COSToolsCLT.c
diff --git a/unsorted/uContextSecret.cpp b/command_line/PluginLib/Src/Internal/CWSecretPluginCallbacks.cpp
index b33ca81..b33ca81 100644
--- a/unsorted/uContextSecret.cpp
+++ b/command_line/PluginLib/Src/Internal/CWSecretPluginCallbacks.cpp
diff --git a/unsorted/uContextParser.cpp b/command_line/PluginLib/Src/Library/CWParserPluginsPrivate.cpp
index 35d6dfa..6973b4d 100644
--- a/unsorted/uContextParser.cpp
+++ b/command_line/PluginLib/Src/Library/CWParserPluginsPrivate.cpp
@@ -7,16 +7,16 @@ static CWParserContext *GetContext(CWPluginContext context) {
         return 0;
 }
 
-CW_CALLBACK CWParserGetBuildDate(CWPluginContext context, const char **buildDate, const char **buildTime) {
+CW_CALLBACK CWParserGetBuildDate(CWPluginContext context, const char **bdate, const char **btime) {
     CWParserContext *pc;
     if (!(pc = GetContext(context)))
         return cwErrInvalidCallback;
-    if (!buildDate)
+    if (!bdate)
         return cwErrInvalidParameter;
-    if (!buildTime)
+    if (!btime)
         return cwErrInvalidParameter;
-    *buildDate = pc->build_date;
-    *buildTime = pc->build_time;
+    *bdate = pc->build_date;
+    *btime = pc->build_time;
     return cwNoErr;
 }
 
diff --git a/unsorted/uContext1.cpp b/command_line/PluginLib/Src/Library/CWPluginsPrivate.cpp
index 7ac712d..2e0df81 100644
--- a/unsorted/uContext1.cpp
+++ b/command_line/PluginLib/Src/Library/CWPluginsPrivate.cpp
@@ -474,10 +474,10 @@ CW_CALLBACK CWPostFileAction(CWPluginContext context, const CWFileSpec *theFile)
     return context->callbacks->cbPostFileAction(context, theFile);
 }
 
-CW_CALLBACK CWCheckoutLicense(CWPluginContext context, const char *a, const char *b, SInt32 c, void *d, SInt32 *cookiePtr) {
+CW_CALLBACK CWCheckoutLicense(CWPluginContext context, const char *featureName, const char *licenseVersion, SInt32 flags, void *reserved, SInt32 *cookie) {
     if (!ValidateContext(context) && !ValidateInitTermContext(context))
         return cwErrInvalidParameter;
-    return context->callbacks->cbCheckoutLicense(context, a, b, c, d, cookiePtr);
+    return context->callbacks->cbCheckoutLicense(context, featureName, licenseVersion, flags, reserved, cookie);
 }
 
 CW_CALLBACK CWCheckinLicense(CWPluginContext context, SInt32 cookie) {
diff --git a/unsorted/uContextCL.cpp b/command_line/PluginLib/Src/Library/DropInCompilerLinkerPrivate.cpp
index 2c0a0c7..2c0a0c7 100644
--- a/unsorted/uContextCL.cpp
+++ b/command_line/PluginLib/Src/Library/DropInCompilerLinkerPrivate.cpp