getting closer

3 files changed, 24 insertions, 38 deletions

diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c
index 31b718f..db6165c 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c
+++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Options/Glue/TargetWarningHelpers-ppc-cc.c
@@ -21,16 +21,16 @@ int TargetSetWarningFlags(short val, Boolean set) {
         case 'Uv': pWarningC.warn_unusedvar = set; break;
         case 'Ua': pWarningC.warn_unusedarg = set; break;
         case 'Ec': pWarningC.warn_extracomma = set; break;
-        case 'Pe': pWarningC.pedantic = set; break;
+        case 'Pd': pWarningC.pedantic = set; break;
         case 'Hv': pWarningC.warn_hidevirtual = set; break;
         case 'Ic': pWarningC.warn_implicitconv = set; break;
         case 'Ni': pWarningC.warn_notinlined = set; break;
         case 'Sc': pWarningC.warn_structclass = set; break;
-        case 'Pa': pExtraWarningC.warn_padding = set ? 1 : 2; break;
-        case 'Nu': pExtraWarningC.warn_resultnotused = set ? 1 : 2; break;
-        case 'Se': pExtraWarningC.warn_no_side_effect = set ? 1 : 2; break;
-        case 'PI': pExtraWarningC.warn_ptr_int_conv = set ? 1 : 2; break;
-        case 'La': pExtraWarningC.warn_largeargs = set ? 1 : 2; break;
+        case 'Pa': pExtraWarningC.warn_padding = set ? PR_ON : PR_OFF; break;
+        case 'Nu': pExtraWarningC.warn_resultnotused = set ? PR_ON : PR_OFF; break;
+        case 'Se': pExtraWarningC.warn_no_side_effect = set ? PR_ON : PR_OFF; break;
+        case 'PI': pExtraWarningC.warn_ptr_int_conv = set ? PR_ON : PR_OFF; break;
+        case 'La': pExtraWarningC.warn_largeargs = set ? PR_ON : PR_OFF; break;
         case 'We': pWarningC.warningerrors = set; break;
         case 'Cp': pFrontEndC.checkprotos = set; break;
         default: return 0;
@@ -64,15 +64,15 @@ void TargetDisplayWarningOptions(Handle txt) {
         HPrintF(txt, "\t- 'inline' not performed\n");
     if (pWarningC.warn_structclass)
         HPrintF(txt, "\t- struct/class conflict\n");
-    if (pExtraWarningC.warn_largeargs)
+    if (pExtraWarningC.warn_largeargs == 1)
         HPrintF(txt, "\t- large args passed to unprototyped functions\n");
-    if (pExtraWarningC.warn_padding)
+    if (pExtraWarningC.warn_padding == 1)
         HPrintF(txt, "\t- padding added between struct members\n");
-    if (pExtraWarningC.warn_resultnotused)
+    if (pExtraWarningC.warn_resultnotused == 1)
         HPrintF(txt, "\t- result of non-void function call not used\n");
-    if (pExtraWarningC.warn_no_side_effect)
+    if (pExtraWarningC.warn_no_side_effect == 1)
         HPrintF(txt, "\t- use of expressions as statements without side effects\n");
-    if (pExtraWarningC.warn_ptr_int_conv)
+    if (pExtraWarningC.warn_ptr_int_conv == 1)
         HPrintF(txt, "\t- implicit integer/pointer conversions\n");
     if (pFrontEndC.checkprotos)
         HPrintF(txt, "\t- checking prototypes\n");
diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/cc-mach-ppc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/cc-mach-ppc.c
index fc6206c..5965d11 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/cc-mach-ppc.c
+++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/cc-mach-ppc.c
@@ -85,7 +85,7 @@ CWPLUGIN_ENTRY (CWPlugin_GetPanelList)(const CWPanelList **panelList) {
 }
 
 static CWPLUGIN_ENTRY (CmdLine_GetObjectFlags)(const CWObjectFlags **objectFlags) {
-    static const CWObjectFlags sFlags = {
+    static const CWObjectFlags myFlags = {
             2,
             0x80000000,
             ".o",
@@ -101,7 +101,7 @@ static CWPLUGIN_ENTRY (CmdLine_GetObjectFlags)(const CWObjectFlags **objectFlags
             CWFOURCHAR('C','W','I','E'), CWFOURCHAR('T','E','X','T')
     };
 
-    *objectFlags = &sFlags;
+    *objectFlags = &myFlags;
     return 0;
 }
 
@@ -361,8 +361,7 @@ static const char *STR10000[] = {
         "possible unwanted ';'",
         "possible unwanted assignment",
         "possible unwanted compare",
-        "illegal implicit conversion from '%t' to",
-        "'%t'",
+        "illegal implicit conversion from '%t' to\n'%t'",
         "local data >32k",
         "illegal jump past initializer",
         "illegal ctor initializer",
@@ -370,12 +369,10 @@ static const char *STR10000[] = {
         "cannot construct %t's direct member '%u'",
         "#if nesting overflow",
         "illegal empty declaration",
-        "illegal implicit enum conversion from '%t' to",
-        "'%t'",
+        "illegal implicit enum conversion from '%t' to\n'%t'",
         "illegal use of #pragma parameter",
         "virtual functions cannot be pascal functions",
-        "illegal implicit const/volatile pointer conversion from '%t' to",
-        "'%t'",
+        "illegal implicit const/volatile pointer conversion from '%t' to\n'%t'",
         "illegal use of non-static member",
         "illegal precompiled header version",
         "illegal precompiled header compiler flags or target",
@@ -399,23 +396,14 @@ static const char *STR10000[] = {
         "illegal constructor/destructor declaration",
         "'catch' expected",
         "#include nesting overflow",
-        "cannot convert",
-        "'%t' to",
-        "'%t'",
-        "type mismatch",
-        "'%t' and",
-        "'%t'",
+        "cannot convert\n'%t' to\n'%t'",
+        "type mismatch\n'%t' and\n'%t'",
         "class type expected",
-        "illegal explicit conversion from '%t' to",
-        "'%t'",
+        "illegal explicit conversion from '%t' to\n'%t'",
         "function call '*' does not match",
-        "identifier '%u' redeclared",
-        "was declared as: '%t'",
-        "now declared as: '%t'",
+        "identifier '%u' redeclared\nwas declared as: '%t'\nnow declared as: '%t'",
         "cannot throw class with ambiguous base class ('%u')",
-        "class '%t': '%o' has more than one final overrider:",
-        "'%o'",
-        "and '%o'",
+        "class '%t': '%o' has more than one final overrider:\n'%o'\nand '%o'",
         "exception handling option is disabled",
         "cannot delete pointer to const",
         "cannot destroy const object",
@@ -469,9 +457,7 @@ static const char *STR10000[] = {
         "illegal use of 'super'",
         "illegal message receiver",
         "receiver cannot handle this message",
-        "ambiguous message selector",
-        "used: '%m'",
-        "also had: '%m'",
+        "ambiguous message selector\nused: '%m'\nalso had: '%m'",
         "unknown message selector",
         "illegal use of Objective-C object",
         "protocol '%u' redefined",
diff --git a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
index b62d413..a0cf8c7 100644
--- a/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
+++ b/compiler_and_linker/CmdLine_Tools/MacOS_PPC/Tools_PPC/Src/Plugin/libimp-mach-ppc.c
@@ -94,7 +94,7 @@ static CWPLUGIN_ENTRY (PPCLibImport_GetFileTypeMappings)(const OSFileTypeMapping
 }
 
 static CWPLUGIN_ENTRY (PPCLibImport_GetObjectFlags)(const CWObjectFlags **objectFlags) {
-    static const CWObjectFlags sFlags = {
+    static const CWObjectFlags myFlags = {
             2,
             0,
             NULL,
@@ -110,7 +110,7 @@ static CWPLUGIN_ENTRY (PPCLibImport_GetObjectFlags)(const CWObjectFlags **object
             0, 0
     };
 
-    *objectFlags = &sFlags;
+    *objectFlags = &myFlags;
     return 0;
 }