#include <stdio.h>\r
\r
#include <Common/UefiBaseTypes.h>\r
-#include "EfiCompress.h"\r
+#include "Compress.h"\r
\r
#define UTILITY_NAME "EfiCompress"\r
#define UTILITY_MAJOR_VERSION 1\r
#define UTILITY_MINOR_VERSION 1\r
\r
void \r
-ECVersion(\r
+Version(\r
void\r
)\r
/*++\r
\r
--*/ \r
{\r
- printf ("%s v%d.%d -EDK Efi Compress Utility\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
+ printf ("%s v%d.%d -Efi Compress Utility\n", UTILITY_NAME, UTILITY_MAJOR_VERSION, UTILITY_MINOR_VERSION);\r
printf ("Copyright (c) 2005-2006 Intel Corporation. All rights reserved.\n");\r
}\r
\r
void \r
-ECUsage(\r
+Usage(\r
void\r
)\r
/*++\r
\r
--*/ \r
{\r
- ECVersion();\r
- printf ("\n Usage: %s Inputfile Outputfile\n", UTILITY_NAME);\r
+ Version();\r
+ printf ("\nUsage: %s Inputfile Outputfile\n", UTILITY_NAME);\r
}\r
\r
\r
SrcBuffer = DstBuffer = NULL;\r
infile = outfile = NULL;\r
\r
- if (argc < 1) {\r
- ECUsage();\r
+ if (argc == 1) {\r
+ Usage();\r
goto Done;\r
}\r
\r
if ((strcmp(argv[1], "-h") == 0) || (strcmp(argv[1], "--help") == 0) ||\r
(strcmp(argv[1], "-?") == 0) || (strcmp(argv[1], "/?") == 0)) {\r
- ECUsage();\r
+ Usage();\r
goto Done;\r
}\r
\r
if ((strcmp(argv[1], "-V") == 0) || (strcmp(argv[1], "--version") == 0)) {\r
- ECVersion();\r
+ Version();\r
goto Done;\r
}\r
\r
if (argc != 3) {\r
- ECUsage();\r
+ Usage();\r
goto Done;\r
}\r
\r
// Get destination data size and do the compression\r
//\r
DstSize = 0;\r
- Status = Compress (SrcBuffer, SrcSize, DstBuffer, &DstSize);\r
+ Status = EfiCompress (SrcBuffer, SrcSize, DstBuffer, &DstSize);\r
if (Status == EFI_BUFFER_TOO_SMALL) {\r
if ((DstBuffer = malloc (DstSize)) == NULL) {\r
printf ("Can't allocate memory\n");\r
goto Done;\r
}\r
\r
- Status = Compress (SrcBuffer, SrcSize, DstBuffer, &DstSize);\r
+ Status = EfiCompress (SrcBuffer, SrcSize, DstBuffer, &DstSize);\r
}\r
\r
if (EFI_ERROR (Status)) {\r