NetworkPkg/HttpBootDxe: Fix the incorrect error message output.

[mirror_edk2.git] / NetworkPkg / HttpBootDxe / HttpBootImpl.c

diff --git a/NetworkPkg/HttpBootDxe/HttpBootImpl.c b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
index 16c1207bf8b1ab52c50f261c60e0963ac742fadb..a0fd934ec4c7bf6794a5a15e2d90e2d5c76d85fd 100644 (file)
--- a/NetworkPkg/HttpBootDxe/HttpBootImpl.c
+++ b/NetworkPkg/HttpBootDxe/HttpBootImpl.c
@@ -1,7 +1,7 @@
 /** @file\r
   The implementation of EFI_LOAD_FILE_PROTOCOL for UEFI HTTP boot.\r
 \r
 /** @file\r
   The implementation of EFI_LOAD_FILE_PROTOCOL for UEFI HTTP boot.\r
 \r

-Copyright (c) 2015 - 2017, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>\r

 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r
 (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 This program and the accompanying materials are licensed and made available under \r
 the terms and conditions of the BSD License that accompanies this distribution.  \r


@@ -331,7 +331,7 @@ HttpBootLoadFile (
     //\r
     Status = HttpBootDiscoverBootInfo (Private);\r
     if (EFI_ERROR (Status)) {\r
     //\r
     Status = HttpBootDiscoverBootInfo (Private);\r
     if (EFI_ERROR (Status)) {\r

-      AsciiPrint ("\n  Error: Could not discover the boot information for DHCP server.\n");\r
+      AsciiPrint ("\n  Error: Could not retrieve NBP file size from HTTP server.\n");\r

       goto ON_EXIT;\r
     }\r
   }\r
       goto ON_EXIT;\r
     }\r
   }\r


@@ -400,22 +400,25 @@ HttpBootLoadFile (
   \r
 ON_EXIT:\r
   HttpBootUninstallCallback (Private);\r
   \r
 ON_EXIT:\r
   HttpBootUninstallCallback (Private);\r

-\r
-  if (Status == EFI_ACCESS_DENIED) {\r
-    AsciiPrint ("\n  Error: Could not establish connection with HTTP server.\n");\r
-  } else if (Status == EFI_BUFFER_TOO_SMALL && Buffer != NULL) {\r
-    AsciiPrint ("\n  Error: Buffer size is smaller than the requested file.\n");\r
-  } else if (Status == EFI_OUT_OF_RESOURCES) {\r
-    AsciiPrint ("\n  Error: Could not allocate I/O buffers.\n");\r
-  } else if (Status == EFI_DEVICE_ERROR) {\r
-    AsciiPrint ("\n  Error: Network device error.\n");\r
-  } else if (Status == EFI_TIMEOUT) {\r
-    AsciiPrint ("\n  Error: Server response timeout.\n");\r
-  } else if (Status == EFI_ABORTED) {\r
-    AsciiPrint ("\n  Error: Remote boot cancelled.\n");\r
-  } else if (Status != EFI_BUFFER_TOO_SMALL) {\r
-    AsciiPrint ("\n  Error: Unexpected network error.\n");\r
+  \r
+  if (EFI_ERROR (Status)) {\r
+    if (Status == EFI_ACCESS_DENIED) {\r
+      AsciiPrint ("\n  Error: Could not establish connection with HTTP server.\n");\r
+    } else if (Status == EFI_BUFFER_TOO_SMALL && Buffer != NULL) {\r
+      AsciiPrint ("\n  Error: Buffer size is smaller than the requested file.\n");\r
+    } else if (Status == EFI_OUT_OF_RESOURCES) {\r
+      AsciiPrint ("\n  Error: Could not allocate I/O buffers.\n");\r
+    } else if (Status == EFI_DEVICE_ERROR) {\r
+      AsciiPrint ("\n  Error: Network device error.\n");\r
+    } else if (Status == EFI_TIMEOUT) {\r
+      AsciiPrint ("\n  Error: Server response timeout.\n");\r
+    } else if (Status == EFI_ABORTED) {\r
+      AsciiPrint ("\n  Error: Remote boot cancelled.\n");\r
+    } else if (Status != EFI_BUFFER_TOO_SMALL) {\r
+      AsciiPrint ("\n  Error: Unexpected network error.\n");\r
+    }\r

   }\r
   }\r

+  \r

   return Status;\r
 }\r
 \r
   return Status;\r
 }\r
 \r