Revert "More Clang changes"

This reverts commit 05d20231c40e6e0818b45e5969a8d6a1c84aa1a4.
Caused problems running/compiling ASLTS.

8 files changed, 9 insertions, 18 deletions

diff --git a/source/components/hardware/hwxfsleep.c b/source/components/hardware/hwxfsleep.c
index 78dc19020..3df8f5a54 100644
--- a/source/components/hardware/hwxfsleep.c
+++ b/source/components/hardware/hwxfsleep.c
@@ -357,10 +357,6 @@ AcpiEnterSleepStateS4bios (
 
     Status = AcpiHwWritePort (AcpiGbl_FADT.SmiCommand,
         (UINT32) AcpiGbl_FADT.S4BiosRequest, 8);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
 
     do {
         AcpiOsStall (ACPI_USEC_PER_MSEC);
diff --git a/source/components/namespace/nsconvert.c b/source/components/namespace/nsconvert.c
index ae5904907..d2b32d25d 100644
--- a/source/components/namespace/nsconvert.c
+++ b/source/components/namespace/nsconvert.c
@@ -670,5 +670,5 @@ AcpiNsConvertToReference (
 ErrorExit:
     ACPI_FREE (Name);
     *ReturnObject = NewObject;
-    return (Status);
+    return (AE_OK);
 }
diff --git a/source/components/namespace/nsdump.c b/source/components/namespace/nsdump.c
index 0ed4d72cb..b504547ac 100644
--- a/source/components/namespace/nsdump.c
+++ b/source/components/namespace/nsdump.c
@@ -760,6 +760,8 @@ AcpiNsDumpOneObject (
 
             goto Cleanup;
         }
+
+        ObjType = ACPI_TYPE_INVALID;   /* Terminate loop after next pass */
     }
 
 Cleanup:
diff --git a/source/components/namespace/nsxfname.c b/source/components/namespace/nsxfname.c
index 2d3e6674c..7332a92f3 100644
--- a/source/components/namespace/nsxfname.c
+++ b/source/components/namespace/nsxfname.c
@@ -611,7 +611,7 @@ AcpiGetObjectInfo (
 
     if (Cls)
     {
-        (void) AcpiNsCopyDeviceId (&Info->ClassCode,
+        NextIdString = AcpiNsCopyDeviceId (&Info->ClassCode,
             Cls, NextIdString);
     }
 
diff --git a/source/components/parser/psobject.c b/source/components/parser/psobject.c
index 388fbe6a1..80df94a53 100644
--- a/source/components/parser/psobject.c
+++ b/source/components/parser/psobject.c
@@ -661,6 +661,7 @@ AcpiPsCompleteOp (
             }
         }
 
+        Status = AE_OK;
         break;
 
     case AE_CTRL_BREAK:
@@ -680,8 +681,8 @@ AcpiPsCompleteOp (
         WalkState->OpInfo = AcpiPsGetOpcodeInfo ((*Op)->Common.AmlOpcode);
         WalkState->Opcode = (*Op)->Common.AmlOpcode;
 
-        (void) WalkState->AscendingCallback (WalkState);
-        (void) AcpiPsNextParseState (WalkState, *Op, Status);
+        Status = WalkState->AscendingCallback (WalkState);
+        Status = AcpiPsNextParseState (WalkState, *Op, Status);
 
         Status2 = AcpiPsCompleteThisOp (WalkState, *Op);
         if (ACPI_FAILURE (Status2))
@@ -689,6 +690,7 @@ AcpiPsCompleteOp (
             return_ACPI_STATUS (Status2);
         }
 
+        Status = AE_OK;
         break;
 
     case AE_CTRL_TERMINATE:
diff --git a/source/components/resources/rscreate.c b/source/components/resources/rscreate.c
index 172bc55fb..26640c209 100644
--- a/source/components/resources/rscreate.c
+++ b/source/components/resources/rscreate.c
@@ -481,10 +481,6 @@ AcpiRsCreatePciRoutingTable (
 
                 Status = AcpiNsHandleToPathname (
                     (ACPI_HANDLE) Node, &PathBuffer, FALSE);
-                if (ACPI_FAILURE (Status))
-                {
-                    return_ACPI_STATUS (Status);
-                }
 
                 /* +1 to include null terminator */
 
diff --git a/source/components/tables/tbdata.c b/source/components/tables/tbdata.c
index 6eb1f24a9..84dd25bdf 100644
--- a/source/components/tables/tbdata.c
+++ b/source/components/tables/tbdata.c
@@ -1190,10 +1190,6 @@ AcpiTbLoadTable (
     }
 
     Status = AcpiNsLoadTable (TableIndex, ParentNode);
-    if (ACPI_FAILURE (Status))
-    {
-        return_ACPI_STATUS (Status);
-    }
 
     /*
      * Update GPEs for any new _Lxx/_Exx methods. Ignore errors. The host is
diff --git a/source/components/utilities/utids.c b/source/components/utilities/utids.c
index 513548c24..5fcfbf668 100644
--- a/source/components/utilities/utids.c
+++ b/source/components/utilities/utids.c
@@ -466,8 +466,7 @@ AcpiUtExecute_CID (
         {
             /* Copy the String CID from the returned object */
 
-            AcpiUtSafeStrcpy (NextIdString, CidObjects[i]->String.Length + 1,
-                CidObjects[i]->String.Pointer);
+            strcpy (NextIdString, CidObjects[i]->String.Pointer);
             Length = CidObjects[i]->String.Length + 1;
         }