Issue #1338 - Part 1: Update NSPR to 4.24

1 files changed, 91 insertions, 89 deletions

diff --git a/nsprpub/pr/tests/errcodes.c b/nsprpub/pr/tests/errcodes.c
index 2ef00b247..591b630b2 100644
--- a/nsprpub/pr/tests/errcodes.c
+++ b/nsprpub/pr/tests/errcodes.c
@@ -18,90 +18,90 @@
 static int _debug_on = 0;
 
 struct errinfo {
-	PRErrorCode errcode;
-	char 		*errname;
+    PRErrorCode errcode;
+    char        *errname;
 };
 
 struct errinfo errcodes[] = {
-{PR_OUT_OF_MEMORY_ERROR,			"PR_OUT_OF_MEMORY_ERROR"},
-{PR_BAD_DESCRIPTOR_ERROR,			"PR_BAD_DESCRIPTOR_ERROR"},
-{PR_WOULD_BLOCK_ERROR,				"PR_WOULD_BLOCK_ERROR"},
-{PR_ACCESS_FAULT_ERROR,				"PR_ACCESS_FAULT_ERROR"},
-{PR_INVALID_METHOD_ERROR,			"PR_INVALID_METHOD_ERROR"},
-{PR_ILLEGAL_ACCESS_ERROR,			"PR_ILLEGAL_ACCESS_ERROR"},
-{PR_UNKNOWN_ERROR,					"PR_UNKNOWN_ERROR"},
-{PR_PENDING_INTERRUPT_ERROR,		"PR_PENDING_INTERRUPT_ERROR"},
-{PR_NOT_IMPLEMENTED_ERROR,			"PR_NOT_IMPLEMENTED_ERROR"},
-{PR_IO_ERROR,						"PR_IO_ERROR"},
-{PR_IO_TIMEOUT_ERROR,				"PR_IO_TIMEOUT_ERROR"},
-{PR_IO_PENDING_ERROR,				"PR_IO_PENDING_ERROR"},
-{PR_DIRECTORY_OPEN_ERROR,			"PR_DIRECTORY_OPEN_ERROR"},
-{PR_INVALID_ARGUMENT_ERROR,			"PR_INVALID_ARGUMENT_ERROR"},
-{PR_ADDRESS_NOT_AVAILABLE_ERROR,	"PR_ADDRESS_NOT_AVAILABLE_ERROR"},
-{PR_ADDRESS_NOT_SUPPORTED_ERROR,	"PR_ADDRESS_NOT_SUPPORTED_ERROR"},
-{PR_IS_CONNECTED_ERROR,				"PR_IS_CONNECTED_ERROR"},
-{PR_BAD_ADDRESS_ERROR,				"PR_BAD_ADDRESS_ERROR"},
-{PR_ADDRESS_IN_USE_ERROR,			"PR_ADDRESS_IN_USE_ERROR"},
-{PR_CONNECT_REFUSED_ERROR,			"PR_CONNECT_REFUSED_ERROR"},
-{PR_NETWORK_UNREACHABLE_ERROR,		"PR_NETWORK_UNREACHABLE_ERROR"},
-{PR_CONNECT_TIMEOUT_ERROR,			"PR_CONNECT_TIMEOUT_ERROR"},
-{PR_NOT_CONNECTED_ERROR,			"PR_NOT_CONNECTED_ERROR"},
-{PR_LOAD_LIBRARY_ERROR,				"PR_LOAD_LIBRARY_ERROR"},
-{PR_UNLOAD_LIBRARY_ERROR,			"PR_UNLOAD_LIBRARY_ERROR"},
-{PR_FIND_SYMBOL_ERROR,				"PR_FIND_SYMBOL_ERROR"},
-{PR_INSUFFICIENT_RESOURCES_ERROR,	"PR_INSUFFICIENT_RESOURCES_ERROR"},
-{PR_DIRECTORY_LOOKUP_ERROR,			"PR_DIRECTORY_LOOKUP_ERROR"},
-{PR_TPD_RANGE_ERROR,				"PR_TPD_RANGE_ERROR"},
-{PR_PROC_DESC_TABLE_FULL_ERROR,		"PR_PROC_DESC_TABLE_FULL_ERROR"},
-{PR_SYS_DESC_TABLE_FULL_ERROR,		"PR_SYS_DESC_TABLE_FULL_ERROR"},
-{PR_NOT_SOCKET_ERROR,				"PR_NOT_SOCKET_ERROR"},
-{PR_NOT_TCP_SOCKET_ERROR,			"PR_NOT_TCP_SOCKET_ERROR"},
-{PR_SOCKET_ADDRESS_IS_BOUND_ERROR,	"PR_SOCKET_ADDRESS_IS_BOUND_ERROR"},
-{PR_NO_ACCESS_RIGHTS_ERROR,			"PR_NO_ACCESS_RIGHTS_ERROR"},
-{PR_OPERATION_NOT_SUPPORTED_ERROR,	"PR_OPERATION_NOT_SUPPORTED_ERROR"},
-{PR_PROTOCOL_NOT_SUPPORTED_ERROR,	"PR_PROTOCOL_NOT_SUPPORTED_ERROR"},
-{PR_REMOTE_FILE_ERROR,				"PR_REMOTE_FILE_ERROR"},
-{PR_BUFFER_OVERFLOW_ERROR,			"PR_BUFFER_OVERFLOW_ERROR"},
-{PR_CONNECT_RESET_ERROR,			"PR_CONNECT_RESET_ERROR"},
-{PR_RANGE_ERROR,					"PR_RANGE_ERROR"},
-{PR_DEADLOCK_ERROR,					"PR_DEADLOCK_ERROR"},
-{PR_FILE_IS_LOCKED_ERROR,			"PR_FILE_IS_LOCKED_ERROR"},
-{PR_FILE_TOO_BIG_ERROR,				"PR_FILE_TOO_BIG_ERROR"},
-{PR_NO_DEVICE_SPACE_ERROR,			"PR_NO_DEVICE_SPACE_ERROR"},
-{PR_PIPE_ERROR,						"PR_PIPE_ERROR"},
-{PR_NO_SEEK_DEVICE_ERROR,			"PR_NO_SEEK_DEVICE_ERROR"},
-{PR_IS_DIRECTORY_ERROR,				"PR_IS_DIRECTORY_ERROR"},
-{PR_LOOP_ERROR,						"PR_LOOP_ERROR"},
-{PR_NAME_TOO_LONG_ERROR,			"PR_NAME_TOO_LONG_ERROR"},
-{PR_FILE_NOT_FOUND_ERROR,			"PR_FILE_NOT_FOUND_ERROR"},
-{PR_NOT_DIRECTORY_ERROR,			"PR_NOT_DIRECTORY_ERROR"},
-{PR_READ_ONLY_FILESYSTEM_ERROR,		"PR_READ_ONLY_FILESYSTEM_ERROR"},
-{PR_DIRECTORY_NOT_EMPTY_ERROR,		"PR_DIRECTORY_NOT_EMPTY_ERROR"},
-{PR_FILESYSTEM_MOUNTED_ERROR,		"PR_FILESYSTEM_MOUNTED_ERROR"},
-{PR_NOT_SAME_DEVICE_ERROR,			"PR_NOT_SAME_DEVICE_ERROR"},
-{PR_DIRECTORY_CORRUPTED_ERROR,		"PR_DIRECTORY_CORRUPTED_ERROR"},
-{PR_FILE_EXISTS_ERROR,				"PR_FILE_EXISTS_ERROR"},
-{PR_MAX_DIRECTORY_ENTRIES_ERROR,	"PR_MAX_DIRECTORY_ENTRIES_ERROR"},
-{PR_INVALID_DEVICE_STATE_ERROR,		"PR_INVALID_DEVICE_STATE_ERROR"},
-{PR_DEVICE_IS_LOCKED_ERROR,			"PR_DEVICE_IS_LOCKED_ERROR"},
-{PR_NO_MORE_FILES_ERROR,			"PR_NO_MORE_FILES_ERROR"},
-{PR_END_OF_FILE_ERROR,				"PR_END_OF_FILE_ERROR"},
-{PR_FILE_SEEK_ERROR,				"PR_FILE_SEEK_ERROR"},
-{PR_FILE_IS_BUSY_ERROR,				"PR_FILE_IS_BUSY_ERROR"},
-{PR_IN_PROGRESS_ERROR,				"PR_IN_PROGRESS_ERROR"},
-{PR_ALREADY_INITIATED_ERROR,		"PR_ALREADY_INITIATED_ERROR"},
-{PR_GROUP_EMPTY_ERROR,				"PR_GROUP_EMPTY_ERROR"},
-{PR_INVALID_STATE_ERROR,			"PR_INVALID_STATE_ERROR"},
-{PR_NETWORK_DOWN_ERROR,				"PR_NETWORK_DOWN_ERROR"},
-{PR_SOCKET_SHUTDOWN_ERROR,			"PR_SOCKET_SHUTDOWN_ERROR"},
-{PR_CONNECT_ABORTED_ERROR,			"PR_CONNECT_ABORTED_ERROR"},
-{PR_HOST_UNREACHABLE_ERROR,			"PR_HOST_UNREACHABLE_ERROR"}
+    {PR_OUT_OF_MEMORY_ERROR,            "PR_OUT_OF_MEMORY_ERROR"},
+    {PR_BAD_DESCRIPTOR_ERROR,           "PR_BAD_DESCRIPTOR_ERROR"},
+    {PR_WOULD_BLOCK_ERROR,              "PR_WOULD_BLOCK_ERROR"},
+    {PR_ACCESS_FAULT_ERROR,             "PR_ACCESS_FAULT_ERROR"},
+    {PR_INVALID_METHOD_ERROR,           "PR_INVALID_METHOD_ERROR"},
+    {PR_ILLEGAL_ACCESS_ERROR,           "PR_ILLEGAL_ACCESS_ERROR"},
+    {PR_UNKNOWN_ERROR,                  "PR_UNKNOWN_ERROR"},
+    {PR_PENDING_INTERRUPT_ERROR,        "PR_PENDING_INTERRUPT_ERROR"},
+    {PR_NOT_IMPLEMENTED_ERROR,          "PR_NOT_IMPLEMENTED_ERROR"},
+    {PR_IO_ERROR,                       "PR_IO_ERROR"},
+    {PR_IO_TIMEOUT_ERROR,               "PR_IO_TIMEOUT_ERROR"},
+    {PR_IO_PENDING_ERROR,               "PR_IO_PENDING_ERROR"},
+    {PR_DIRECTORY_OPEN_ERROR,           "PR_DIRECTORY_OPEN_ERROR"},
+    {PR_INVALID_ARGUMENT_ERROR,         "PR_INVALID_ARGUMENT_ERROR"},
+    {PR_ADDRESS_NOT_AVAILABLE_ERROR,    "PR_ADDRESS_NOT_AVAILABLE_ERROR"},
+    {PR_ADDRESS_NOT_SUPPORTED_ERROR,    "PR_ADDRESS_NOT_SUPPORTED_ERROR"},
+    {PR_IS_CONNECTED_ERROR,             "PR_IS_CONNECTED_ERROR"},
+    {PR_BAD_ADDRESS_ERROR,              "PR_BAD_ADDRESS_ERROR"},
+    {PR_ADDRESS_IN_USE_ERROR,           "PR_ADDRESS_IN_USE_ERROR"},
+    {PR_CONNECT_REFUSED_ERROR,          "PR_CONNECT_REFUSED_ERROR"},
+    {PR_NETWORK_UNREACHABLE_ERROR,      "PR_NETWORK_UNREACHABLE_ERROR"},
+    {PR_CONNECT_TIMEOUT_ERROR,          "PR_CONNECT_TIMEOUT_ERROR"},
+    {PR_NOT_CONNECTED_ERROR,            "PR_NOT_CONNECTED_ERROR"},
+    {PR_LOAD_LIBRARY_ERROR,             "PR_LOAD_LIBRARY_ERROR"},
+    {PR_UNLOAD_LIBRARY_ERROR,           "PR_UNLOAD_LIBRARY_ERROR"},
+    {PR_FIND_SYMBOL_ERROR,              "PR_FIND_SYMBOL_ERROR"},
+    {PR_INSUFFICIENT_RESOURCES_ERROR,   "PR_INSUFFICIENT_RESOURCES_ERROR"},
+    {PR_DIRECTORY_LOOKUP_ERROR,         "PR_DIRECTORY_LOOKUP_ERROR"},
+    {PR_TPD_RANGE_ERROR,                "PR_TPD_RANGE_ERROR"},
+    {PR_PROC_DESC_TABLE_FULL_ERROR,     "PR_PROC_DESC_TABLE_FULL_ERROR"},
+    {PR_SYS_DESC_TABLE_FULL_ERROR,      "PR_SYS_DESC_TABLE_FULL_ERROR"},
+    {PR_NOT_SOCKET_ERROR,               "PR_NOT_SOCKET_ERROR"},
+    {PR_NOT_TCP_SOCKET_ERROR,           "PR_NOT_TCP_SOCKET_ERROR"},
+    {PR_SOCKET_ADDRESS_IS_BOUND_ERROR,  "PR_SOCKET_ADDRESS_IS_BOUND_ERROR"},
+    {PR_NO_ACCESS_RIGHTS_ERROR,         "PR_NO_ACCESS_RIGHTS_ERROR"},
+    {PR_OPERATION_NOT_SUPPORTED_ERROR,  "PR_OPERATION_NOT_SUPPORTED_ERROR"},
+    {PR_PROTOCOL_NOT_SUPPORTED_ERROR,   "PR_PROTOCOL_NOT_SUPPORTED_ERROR"},
+    {PR_REMOTE_FILE_ERROR,              "PR_REMOTE_FILE_ERROR"},
+    {PR_BUFFER_OVERFLOW_ERROR,          "PR_BUFFER_OVERFLOW_ERROR"},
+    {PR_CONNECT_RESET_ERROR,            "PR_CONNECT_RESET_ERROR"},
+    {PR_RANGE_ERROR,                    "PR_RANGE_ERROR"},
+    {PR_DEADLOCK_ERROR,                 "PR_DEADLOCK_ERROR"},
+    {PR_FILE_IS_LOCKED_ERROR,           "PR_FILE_IS_LOCKED_ERROR"},
+    {PR_FILE_TOO_BIG_ERROR,             "PR_FILE_TOO_BIG_ERROR"},
+    {PR_NO_DEVICE_SPACE_ERROR,          "PR_NO_DEVICE_SPACE_ERROR"},
+    {PR_PIPE_ERROR,                     "PR_PIPE_ERROR"},
+    {PR_NO_SEEK_DEVICE_ERROR,           "PR_NO_SEEK_DEVICE_ERROR"},
+    {PR_IS_DIRECTORY_ERROR,             "PR_IS_DIRECTORY_ERROR"},
+    {PR_LOOP_ERROR,                     "PR_LOOP_ERROR"},
+    {PR_NAME_TOO_LONG_ERROR,            "PR_NAME_TOO_LONG_ERROR"},
+    {PR_FILE_NOT_FOUND_ERROR,           "PR_FILE_NOT_FOUND_ERROR"},
+    {PR_NOT_DIRECTORY_ERROR,            "PR_NOT_DIRECTORY_ERROR"},
+    {PR_READ_ONLY_FILESYSTEM_ERROR,     "PR_READ_ONLY_FILESYSTEM_ERROR"},
+    {PR_DIRECTORY_NOT_EMPTY_ERROR,      "PR_DIRECTORY_NOT_EMPTY_ERROR"},
+    {PR_FILESYSTEM_MOUNTED_ERROR,       "PR_FILESYSTEM_MOUNTED_ERROR"},
+    {PR_NOT_SAME_DEVICE_ERROR,          "PR_NOT_SAME_DEVICE_ERROR"},
+    {PR_DIRECTORY_CORRUPTED_ERROR,      "PR_DIRECTORY_CORRUPTED_ERROR"},
+    {PR_FILE_EXISTS_ERROR,              "PR_FILE_EXISTS_ERROR"},
+    {PR_MAX_DIRECTORY_ENTRIES_ERROR,    "PR_MAX_DIRECTORY_ENTRIES_ERROR"},
+    {PR_INVALID_DEVICE_STATE_ERROR,     "PR_INVALID_DEVICE_STATE_ERROR"},
+    {PR_DEVICE_IS_LOCKED_ERROR,         "PR_DEVICE_IS_LOCKED_ERROR"},
+    {PR_NO_MORE_FILES_ERROR,            "PR_NO_MORE_FILES_ERROR"},
+    {PR_END_OF_FILE_ERROR,              "PR_END_OF_FILE_ERROR"},
+    {PR_FILE_SEEK_ERROR,                "PR_FILE_SEEK_ERROR"},
+    {PR_FILE_IS_BUSY_ERROR,             "PR_FILE_IS_BUSY_ERROR"},
+    {PR_IN_PROGRESS_ERROR,              "PR_IN_PROGRESS_ERROR"},
+    {PR_ALREADY_INITIATED_ERROR,        "PR_ALREADY_INITIATED_ERROR"},
+    {PR_GROUP_EMPTY_ERROR,              "PR_GROUP_EMPTY_ERROR"},
+    {PR_INVALID_STATE_ERROR,            "PR_INVALID_STATE_ERROR"},
+    {PR_NETWORK_DOWN_ERROR,             "PR_NETWORK_DOWN_ERROR"},
+    {PR_SOCKET_SHUTDOWN_ERROR,          "PR_SOCKET_SHUTDOWN_ERROR"},
+    {PR_CONNECT_ABORTED_ERROR,          "PR_CONNECT_ABORTED_ERROR"},
+    {PR_HOST_UNREACHABLE_ERROR,         "PR_HOST_UNREACHABLE_ERROR"}
 };
 
 int main(int argc, char **argv)
 {
 
-	int count, errnum;
+    int count, errnum;
 
     /*
      * -d           debug mode
@@ -111,24 +111,26 @@ int main(int argc, char **argv)
     PLOptState *opt = PL_CreateOptState(argc, argv, "d");
     while (PL_OPT_EOL != (os = PL_GetNextOpt(opt)))
     {
-        if (PL_OPT_BAD == os) continue;
+        if (PL_OPT_BAD == os) {
+            continue;
+        }
         switch (opt->option)
         {
-        case 'd':  /* debug mode */
-            _debug_on = 1;
-            break;
-        default:
-            break;
+            case 'd':  /* debug mode */
+                _debug_on = 1;
+                break;
+            default:
+                break;
         }
     }
     PL_DestroyOptState(opt);
 
-	count = sizeof(errcodes)/sizeof(errcodes[0]);
-	printf("\nNumber of error codes = %d\n\n",count);
-	for (errnum = 0; errnum < count; errnum++) {
-		printf("%-40s = %d\n",errcodes[errnum].errname,
-						errcodes[errnum].errcode);
-	}
+    count = sizeof(errcodes)/sizeof(errcodes[0]);
+    printf("\nNumber of error codes = %d\n\n",count);
+    for (errnum = 0; errnum < count; errnum++) {
+        printf("%-40s = %d\n",errcodes[errnum].errname,
+               errcodes[errnum].errcode);
+    }
 
-	return 0;
+    return 0;
 }