From 69817bf8e049f8a83fd24e85f6368fbd57e8d3ee Mon Sep 17 00:00:00 2001 From: qhuang8 Date: Wed, 20 May 2009 14:42:48 +0000 Subject: [PATCH] Fix several Unicode issues that fails VS2005. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8350 6f19259b-4bc3-4df7-8a09-765794883524 --- ShellPkg/Include/Library/FileHandleLib.h | 18 +++++++-------- ShellPkg/Include/Library/ShellLib.h | 20 ++++++++--------- ShellPkg/Include/Protocol/EfiShell.h | 4 ++-- .../BaseFileHandleLib/BaseFileHandleLib.c | 18 +++++++-------- ShellPkg/Library/BaseShellLib/BaseShellLib.c | 22 +++++++++---------- 5 files changed, 41 insertions(+), 41 deletions(-) diff --git a/ShellPkg/Include/Library/FileHandleLib.h b/ShellPkg/Include/Library/FileHandleLib.h index 8140dae32f..3d2bbd1535 100644 --- a/ShellPkg/Include/Library/FileHandleLib.h +++ b/ShellPkg/Include/Library/FileHandleLib.h @@ -23,8 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This function will retrieve the information about the file for the handle specified and store it in allocated pool memory. - This function allocates a buffer to store the file’s information. It is the - caller’s responsibility to free the buffer + This function allocates a buffer to store the file's information. It is the + caller's responsibility to free the buffer @param FileHandle The file handle of the file for which information is being requested. @@ -68,11 +68,11 @@ FileHandleSetInfo ( This function reads information from an opened file. If FileHandle is not a directory, the function reads the requested number of - bytes from the file at the file’s current position and returns them in Buffer. + bytes from the file at the file's current position and returns them in Buffer. If the read goes beyond the end of the file, the read length is truncated to the - end of the file. The file’s current position is increased by the number of bytes + end of the file. The file's current position is increased by the number of bytes returned. If FileHandle is a directory, the function reads the directory entry - at the file’s current position and returns the entry in Buffer. If the Buffer + at the file's current position and returns the entry in Buffer. If the Buffer is not large enough to hold the current directory entry, then EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. BufferSize is set to be the size of the buffer needed to read the entry. On @@ -107,7 +107,7 @@ FileHandleRead( This function writes the specified number of bytes to the file at the current file position. The current file position is advanced the actual number of bytes written, which is returned in BufferSize. Partial writes only occur when there - has been a data error during the write attempt (such as “volume space full”). + has been a data error during the write attempt (such as "volume space full"). The file is automatically grown to hold the data if required. Direct writes to opened directories are not supported. @@ -136,7 +136,7 @@ FileHandleWrite( /** Close an open file handle. - This function closes a specified file handle. All “dirty” cached file data is + This function closes a specified file handle. All "dirty" cached file data is flushed to the device, and the file is closed. In all cases the handle is closed. @@ -260,7 +260,7 @@ FileHandleIsDirectory ( /** Retrieves the first file from a directory - This function opens a directory and gets the first file’s info in the + This function opens a directory and gets the first file's info in the directory. Caller can use FileHandleFindNextFile() to get other files. When complete the caller is responsible for calling FreePool() on *Buffer. @@ -314,7 +314,7 @@ FileHandleFindNextFile( if FileHandle is NULL then ASSERT() if Size is NULL then ASSERT() - This function extracts the file size info from the FileHandle’s EFI_FILE_INFO + This function extracts the file size info from the FileHandle's EFI_FILE_INFO data. @param FileHandle file handle from which size is retrieved diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h index 5614d7174f..ad3cc01f42 100644 --- a/ShellPkg/Include/Library/ShellLib.h +++ b/ShellPkg/Include/Library/ShellLib.h @@ -22,8 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This function will retrieve the information about the file for the handle specified and store it in allocated pool memory. - This function allocates a buffer to store the file’s information. It is the - caller’s responsibility to free the buffer + This function allocates a buffer to store the file's information. It is the + caller's responsibility to free the buffer @param FileHandle The file handle of the file for which information is being requested. @@ -106,7 +106,7 @@ ShellOpenFileByDevicePath( /** This function will open a file or directory referenced by filename. - If return is EFI_SUCCESS, the Filehandle is the opened file’s handle; + If return is EFI_SUCCESS, the Filehandle is the opened file's handle; otherwise, the Filehandle is NULL. The Attributes is valid only for EFI_FILE_MODE_CREATE. @@ -179,11 +179,11 @@ ShellCreateDirectory( This function reads information from an opened file. If FileHandle is not a directory, the function reads the requested number of - bytes from the file at the file’s current position and returns them in Buffer. + bytes from the file at the file's current position and returns them in Buffer. If the read goes beyond the end of the file, the read length is truncated to the - end of the file. The file’s current position is increased by the number of bytes + end of the file. The file's current position is increased by the number of bytes returned. If FileHandle is a directory, the function reads the directory entry - at the file’s current position and returns the entry in Buffer. If the Buffer + at the file's current position and returns the entry in Buffer. If the Buffer is not large enough to hold the current directory entry, then EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. BufferSize is set to be the size of the buffer needed to read the entry. On @@ -220,7 +220,7 @@ ShellReadFile( This function writes the specified number of bytes to the file at the current file position. The current file position is advanced the actual number of bytes written, which is returned in BufferSize. Partial writes only occur when there - has been a data error during the write attempt (such as “volume space full”). + has been a data error during the write attempt (such as "volume space full"). The file is automatically grown to hold the data if required. Direct writes to opened directories are not supported. @@ -251,7 +251,7 @@ ShellWriteFile( /** Close an open file handle. - This function closes a specified file handle. All “dirty” cached file data is + This function closes a specified file handle. All "dirty" cached file data is flushed to the device, and the file is closed. In all cases the handle is closed. @@ -411,7 +411,7 @@ ShellFindNextFile( /** Retrieve the size of a file. - This function extracts the file size info from the FileHandle’s EFI_FILE_INFO + This function extracts the file size info from the FileHandle's EFI_FILE_INFO data. @param FileHandle file handle from which size is retrieved @@ -527,7 +527,7 @@ ShellExecute ( /** Retreives the current directory path - If the DeviceName is NULL, it returns the current device’s current directory + If the DeviceName is NULL, it returns the current device's current directory name. If the DeviceName is not NULL, it returns the current directory name on specified drive. diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h index bd0aebe1d8..d19f3b005f 100644 --- a/ShellPkg/Include/Protocol/EfiShell.h +++ b/ShellPkg/Include/Protocol/EfiShell.h @@ -315,11 +315,11 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS; NULL and EFI_NOT_FOUND will be returned. If EFI_DEVICE_NAME_USE_COMPONENT_NAME is set, then the function will return the - device’s name using the EFI_COMPONENT_NAME2_PROTOCOL, if present on + device's name using the EFI_COMPONENT_NAME2_PROTOCOL, if present on DeviceHandle. If EFI_DEVICE_NAME_USE_DEVICE_PATH is set, then the function will return the - device’s name using the EFI_DEVICE_PATH_PROTOCOL, if present on DeviceHandle. + device's name using the EFI_DEVICE_PATH_PROTOCOL, if present on DeviceHandle. If both EFI_DEVICE_NAME_USE_COMPONENT_NAME and EFI_DEVICE_NAME_USE_DEVICE_PATH are set, then EFI_DEVICE_NAME_USE_COMPONENT_NAME will have higher priority. diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c index 6822b748b4..87b5772488 100644 --- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c +++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c @@ -27,8 +27,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. This function will retrieve the information about the file for the handle specified and store it in allocated pool memory. - This function allocates a buffer to store the file’s information. It is the - caller’s responsibility to free the buffer + This function allocates a buffer to store the file's information. It is the + caller's responsibility to free the buffer @param FileHandle The file handle of the file for which information is being requested. @@ -133,11 +133,11 @@ FileHandleSetInfo ( This function reads information from an opened file. If FileHandle is not a directory, the function reads the requested number of - bytes from the file at the file’s current position and returns them in Buffer. + bytes from the file at the file's current position and returns them in Buffer. If the read goes beyond the end of the file, the read length is truncated to the - end of the file. The file’s current position is increased by the number of bytes + end of the file. The file's current position is increased by the number of bytes returned. If FileHandle is a directory, the function reads the directory entry - at the file’s current position and returns the entry in Buffer. If the Buffer + at the file's current position and returns the entry in Buffer. If the Buffer is not large enough to hold the current directory entry, then EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. BufferSize is set to be the size of the buffer needed to read the entry. On @@ -184,7 +184,7 @@ FileHandleRead( This function writes the specified number of bytes to the file at the current file position. The current file position is advanced the actual number of bytes written, which is returned in BufferSize. Partial writes only occur when there - has been a data error during the write attempt (such as “volume space full”). + has been a data error during the write attempt (such as "volume space full"). The file is automatically grown to hold the data if required. Direct writes to opened directories are not supported. @@ -223,7 +223,7 @@ FileHandleWrite( /** Close an open file handle. - This function closes a specified file handle. All “dirty” cached file data is + This function closes a specified file handle. All "dirty" cached file data is flushed to the device, and the file is closed. In all cases the handle is closed. @@ -436,7 +436,7 @@ FileHandleIsDirectory ( /** Retrieves the first file from a directory - This function opens a directory and gets the first file’s info in the + This function opens a directory and gets the first file's info in the directory. Caller can use FileHandleFindNextFile() to get other files. When complete the caller is responsible for calling FreePool() on Buffer. @@ -577,7 +577,7 @@ FileHandleFindNextFile( if FileHandle is NULL then ASSERT() if Size is NULL then ASSERT() - This function extracts the file size info from the FileHandle’s EFI_FILE_INFO + This function extracts the file size info from the FileHandle's EFI_FILE_INFO data. @param FileHandle file handle from which size is retrieved diff --git a/ShellPkg/Library/BaseShellLib/BaseShellLib.c b/ShellPkg/Library/BaseShellLib/BaseShellLib.c index a0e2e492e1..a43966083f 100644 --- a/ShellPkg/Library/BaseShellLib/BaseShellLib.c +++ b/ShellPkg/Library/BaseShellLib/BaseShellLib.c @@ -329,8 +329,8 @@ ShellInitialize ( This function will retrieve the information about the file for the handle specified and store it in allocated pool memory. - This function allocates a buffer to store the file’s information. It is the - caller’s responsibility to free the buffer + This function allocates a buffer to store the file's information. It is the + caller's responsibility to free the buffer @param FileHandle The file handle of the file for which information is being requested. @@ -530,7 +530,7 @@ ShellOpenFileByDevicePath( /** This function will open a file or directory referenced by filename. - If return is EFI_SUCCESS, the Filehandle is the opened file’s handle; + If return is EFI_SUCCESS, the Filehandle is the opened file's handle; otherwise, the Filehandle is NULL. The Attributes is valid only for EFI_FILE_MODE_CREATE. @@ -650,11 +650,11 @@ ShellCreateDirectory( This function reads information from an opened file. If FileHandle is not a directory, the function reads the requested number of - bytes from the file at the file’s current position and returns them in Buffer. + bytes from the file at the file's current position and returns them in Buffer. If the read goes beyond the end of the file, the read length is truncated to the - end of the file. The file’s current position is increased by the number of bytes + end of the file. The file's current position is increased by the number of bytes returned. If FileHandle is a directory, the function reads the directory entry - at the file’s current position and returns the entry in Buffer. If the Buffer + at the file's current position and returns the entry in Buffer. If the Buffer is not large enough to hold the current directory entry, then EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. BufferSize is set to be the size of the buffer needed to read the entry. On @@ -693,7 +693,7 @@ ShellReadFile( This function writes the specified number of bytes to the file at the current file position. The current file position is advanced the actual number of bytes written, which is returned in BufferSize. Partial writes only occur when there - has been a data error during the write attempt (such as “volume space full”). + has been a data error during the write attempt (such as "volume space full"). The file is automatically grown to hold the data if required. Direct writes to opened directories are not supported. @@ -725,7 +725,7 @@ ShellWriteFile( /** Close an open file handle. - This function closes a specified file handle. All “dirty” cached file data is + This function closes a specified file handle. All "dirty" cached file data is flushed to the device, and the file is closed. In all cases the handle is closed. @@ -844,7 +844,7 @@ ShellFlushFile ( /** Retrieves the first file from a directory - This function opens a directory and gets the first file’s info in the + This function opens a directory and gets the first file's info in the directory. Caller can use ShellFindNextFile() to get other files. When complete the caller is responsible for calling FreePool() on Buffer. @@ -909,7 +909,7 @@ ShellFindNextFile( if FileHandle is NULL then ASSERT() if Size is NULL then ASSERT() - This function extracts the file size info from the FileHandle’s EFI_FILE_INFO + This function extracts the file size info from the FileHandle's EFI_FILE_INFO data. @param FileHandle file handle from which size is retrieved @@ -1100,7 +1100,7 @@ ShellExecute ( /** Retreives the current directory path - If the DeviceName is NULL, it returns the current device’s current directory + If the DeviceName is NULL, it returns the current device's current directory name. If the DeviceName is not NULL, it returns the current directory name on specified drive.