4 files changed, 3 insertions, 8 deletions
diff --git a/source/os_specific/service_layers/osunixdir.c b/source/os_specific/service_layers/osunixdir.c
index 20b153c3d485..7916c0315964 100644
--- a/source/os_specific/service_layers/osunixdir.c
+++ b/source/os_specific/service_layers/osunixdir.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: osunixdir - Unix directory access interfaces
@@ -60,7 +59,7 @@ typedef struct ExternalFindInfo
 {
     char                        *DirPathname;
     DIR                         *DirPtr;
-    char                        temp_buffer[128];
+    char                        temp_buffer[256];
     char                        *WildcardSpec;
     char                        RequestedFileType;
 
@@ -93,7 +92,7 @@ AcpiOsOpenDirectory (
 
     /* Allocate the info struct that will be returned to the caller */
 
-    ExternalInfo = calloc (sizeof (EXTERNAL_FIND_INFO), 1);
+    ExternalInfo = calloc (1, sizeof (EXTERNAL_FIND_INFO));
     if (!ExternalInfo)
     {
         return (NULL);
diff --git a/source/os_specific/service_layers/oswindir.c b/source/os_specific/service_layers/oswindir.c
index 2cdcb945860b..ab2d810a944f 100644
--- a/source/os_specific/service_layers/oswindir.c
+++ b/source/os_specific/service_layers/oswindir.c
@@ -1,4 +1,3 @@
-
 /******************************************************************************
  *
  * Module Name: oswindir - Windows directory access interfaces
@@ -248,4 +247,3 @@ AcpiOsCloseDirectory (
     free (SearchInfo->FullWildcardSpec);
     free (DirHandle);
 }
-
diff --git a/source/os_specific/service_layers/oswintbl.c b/source/os_specific/service_layers/oswintbl.c
index db34966a0d9e..2158b05377d1 100644
--- a/source/os_specific/service_layers/oswintbl.c
+++ b/source/os_specific/service_layers/oswintbl.c
@@ -219,4 +219,3 @@ Cleanup:
     RegCloseKey (Handle);
     return (ReturnTable);
 }
-
diff --git a/source/os_specific/service_layers/oswinxf.c b/source/os_specific/service_layers/oswinxf.c
index 68629a272efd..b8b3e37cb14d 100644
--- a/source/os_specific/service_layers/oswinxf.c
+++ b/source/os_specific/service_layers/oswinxf.c
@@ -268,8 +268,8 @@ AcpiOsTableOverride (
 
     /* Construct a null-terminated string from table signature */
 
+    ACPI_MOVE_NAME (TableName, ExistingTable->Signature);
     TableName[ACPI_NAME_SIZE] = 0;
-    ACPI_STRNCPY (TableName, ExistingTable->Signature, ACPI_NAME_SIZE);
 
     *NewTable = OsGetTable (TableName);
     if (*NewTable)
@@ -1503,4 +1503,3 @@ AcpiOsWaitEventsComplete (
 {
     return;
 }
-