[vbox-dev] [Patch] No more eRRRors.
Kalogrianitis Socratis
socratisk at gmail.com
Thu Jun 8 23:39:28 GMT 2017
I was going through a VBoxHardening.log while searching for "error". I bumped upon a string that looked like it, but it wasn't. it was an ERRROR with 3 "R"s. So, a global search for "errror" and a replace, results in the following patch. Sure, most of them are in comments but there are two in the actual results, like the one in "SUPHardenedVerifyImage-win.cpp" that actually bit me. And you might as well fix them all, while at it.
Meanwhile, going through them, I saw two instances of "NS_ERROR_UNEXPECTD" which clearly mean "NS_ERROR_UNEXPECTED", like the rest 239 instances in the trunk. So I fixed those as well.
This patch is provided under the MIT license.
Socratis
Index: src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/public/ipcITransactionService.idl
===================================================================
--- src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/public/ipcITransactionService.idl (revision 67279)
+++ src/libs/xpcom18a4/ipc/ipcd/extensions/transmngr/public/ipcITransactionService.idl (working copy)
@@ -160,7 +160,7 @@
*
* @returns NS_ERROR_FAILURE is something goes wrong
*
- * @returns NS_ERRROR_UNEXPECTD if the domain does not have an observer
+ * @returns NS_ERROR_UNEXPECTED if the domain does not have an observer
* attached
*/
void detach(in ACString aDomainName);
@@ -188,7 +188,7 @@
*
* @returns NS_ERROR_FAILURE is something goes wrong
*
- * @returns NS_ERRROR_UNEXPECTD if the domain does not have an observer
+ * @returns NS_ERROR_UNEXPECTED if the domain does not have an observer
* attached
*/
void flush(in ACString aDomainName, in PRBool aLockingCall);
Index: src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c
===================================================================
--- src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c (revision 67279)
+++ src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Network/IScsiDxe/IScsiProto.c (working copy)
@@ -2195,7 +2195,7 @@
@retval EFI_SUCCES The check on the Data IN PDU is passed and some update
actions are taken.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror happened.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error happened.
@retval EFI_BAD_BUFFER_SIZEE The buffer was not the proper size for the request.
@retval Others Other errors as indicated.
**/
@@ -2284,7 +2284,7 @@
@param[in, out] Packet The EXT SCSI PASS THRU request packet.
@retval EFI_SUCCES The R2T PDU is valid and the solicited data is sent out.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror happened.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error happened.
@retval Others Other errors as indicated.
**/
EFI_STATUS
@@ -2350,7 +2350,7 @@
@param[in, out] Packet The EXT SCSI PASS THRU request packet.
@retval EFI_SUCCES The Response PDU is processed.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror happened.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error happened.
@retval EFI_BAD_BUFFER_SIZEE The buffer was not the proper size for the request.
@retval Others Other errors as indicated.
**/
@@ -2457,7 +2457,7 @@
@retval EFI_SUCCES The NOP In PDU is processed and the related sequence
numbers are updated.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror happened.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error happened.
**/
EFI_STATUS
IScsiOnNopInRcvd (
Index: src/VBox/Devices/EFI/Firmware/NetworkPkg/IScsiDxe/IScsiProto.c
===================================================================
--- src/VBox/Devices/EFI/Firmware/NetworkPkg/IScsiDxe/IScsiProto.c (revision 67279)
+++ src/VBox/Devices/EFI/Firmware/NetworkPkg/IScsiDxe/IScsiProto.c (working copy)
@@ -2502,7 +2502,7 @@
@retval EFI_SUCCES The check on the Data IN PDU is passed and some update
actions are taken.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror occurred.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error occurred.
@retval EFI_BAD_BUFFER_SIZEE The buffer was not the proper size for the request.
@retval Others Other errors as indicated.
@@ -2593,7 +2593,7 @@
@param[in, out] Packet The EXT SCSI PASS THRU request packet.
@retval EFI_SUCCES The R2T PDU is valid and the solicited data is sent out.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror occurred.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error occurred.
@retval Others Other errors as indicated.
**/
@@ -2661,7 +2661,7 @@
@param[in, out] Packet The EXT SCSI PASS THRU request packet.
@retval EFI_SUCCES The Response PDU is processed.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror occurred.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error occurred.
@retval EFI_BAD_BUFFER_SIZEE The buffer was not the proper size for the request.
@retval Others Other errors as indicated.
@@ -2770,7 +2770,7 @@
@retval EFI_SUCCES The NOP In PDU is processed and the related sequence
numbers are updated.
- @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol errror occurred.
+ @retval EFI_PROTOCOL_ERROR Some kind of iSCSI protocol error occurred.
**/
EFI_STATUS
Index: src/VBox/Main/webservice/samples/python/clienttest.py
===================================================================
--- src/VBox/Main/webservice/samples/python/clienttest.py (revision 67279)
+++ src/VBox/Main/webservice/samples/python/clienttest.py (working copy)
@@ -105,7 +105,7 @@
session.unlockMachine()
except Exception, e:
- print "Errror [%s]: %s" %(mach.name, str(e))
+ print "Error [%s]: %s" %(mach.name, str(e))
traceback.print_exc()
# Call destructor and delete manager
Index: src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp
===================================================================
--- src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp (revision 67279)
+++ src/VBox/HostDrivers/Support/win/SUPHardenedVerifyImage-win.cpp (working copy)
@@ -2590,7 +2590,7 @@
ULONG ulErr = RtlGetLastWin32Error();
fNoSignedCatalogFound = ulErr == ERROR_NOT_FOUND && fNoSignedCatalogFound != 0;
if (iCat == 0)
- SUP_DPRINTF(("supR3HardNtViCallWinVerifyTrustCatFile: CryptCATAdminEnumCatalogFromHash failed ERRROR_NOT_FOUND (%u)\n", ulErr));
+ SUP_DPRINTF(("supR3HardNtViCallWinVerifyTrustCatFile: CryptCATAdminEnumCatalogFromHash failed ERROR_NOT_FOUND (%u)\n", ulErr));
else if (iCat == 0)
SUP_DPRINTF(("supR3HardNtViCallWinVerifyTrustCatFile: CryptCATAdminEnumCatalogFromHash failed %u\n", ulErr));
break;
Index: src/VBox/Additions/x11/x11include/glproto-1.4.10/GL/glxproto.h
===================================================================
--- src/VBox/Additions/x11/x11include/glproto-1.4.10/GL/glxproto.h (revision 67279)
+++ src/VBox/Additions/x11/x11include/glproto-1.4.10/GL/glxproto.h (working copy)
@@ -36,7 +36,7 @@
/*****************************************************************************/
/*
-** Errrors.
+** Errors.
*/
#define GLXBadContext 0
#define GLXBadContextState 1
VB-OSX-109-Build:vbox socratis$
More information about the vbox-dev
mailing list