Index: trunk/src/libs/xpcom18a4/nsprpub/pr/include/prerror.h
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/include/prerror.h	(revision 102203)
+++ trunk/src/libs/xpcom18a4/nsprpub/pr/include/prerror.h	(revision 102207)
@@ -43,14 +43,4 @@
 #ifdef VBOX_WITH_XPCOM_NAMESPACE_CLEANUP
 #define PR_SetError VBoxNsprPR_SetError
-#define PR_SetErrorText VBoxNsprPR_SetErrorText
-#define PR_GetError VBoxNsprPR_GetError
-#define PR_GetOSError VBoxNsprPR_GetOSError
-#define PR_GetErrorTextLength VBoxNsprPR_GetErrorTextLength
-#define PR_GetErrorText VBoxNsprPR_GetErrorText
-#define PR_ErrorToString VBoxNsprPR_ErrorToString
-#define PR_ErrorToName VBoxNsprPR_ErrorToName
-#define PR_ErrorLanguages VBoxNsprPR_ErrorLanguages
-#define PR_ErrorInstallTable VBoxNsprPR_ErrorInstallTable
-#define PR_ErrorInstallCallback VBoxNsprPR_ErrorInstallCallback
 #endif /* VBOX_WITH_XPCOM_NAMESPACE_CLEANUP */
 PR_BEGIN_EXTERN_C
@@ -70,269 +60,4 @@
 NSPR_API(void) PR_SetError(PRErrorCode errorCode, PRInt32 oserr);
 
-/*
-** The text value specified may be NULL. If it is not NULL and the text length
-** is zero, the string is assumed to be a null terminated C string. Otherwise
-** the text is assumed to be the length specified and possibly include NULL
-** characters (e.g., a multi-national string).
-**
-** The text will be copied into to thread structure and remain there
-** until the next call to PR_SetError.
-*/
-NSPR_API(void) PR_SetErrorText(
-    PRIntn textLength, const char *text);
-
-/*
-** Return the current threads last set error code.
-*/
-NSPR_API(PRErrorCode) PR_GetError(void);
-
-/*
-** Return the current threads last set os error code. This is used for
-** machine specific code that desires the underlying os error.
-*/
-NSPR_API(PRInt32) PR_GetOSError(void);
-
-/*
-** Get the length of the error text. If a zero is returned, then there
-** is no text. Otherwise, the value returned is sufficient to contain
-** the error text currently available.
-*/
-NSPR_API(PRInt32) PR_GetErrorTextLength(void);
-
-/*
-** Copy the current threads current error text. Then actual number of bytes
-** copied is returned as the result. If the result is zero, the 'text' area
-** is unaffected.
-*/
-NSPR_API(PRInt32) PR_GetErrorText(char *text);
-
-
-/*
-Copyright (C) 1987, 1988 Student Information Processing Board of the
-Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided
-that the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution of the software
-without specific, written prior permission.  M.I.T. and the M.I.T. S.I.P.B.
-make no representations about the suitability of this software for any
-purpose.  It is provided "as is" without express or implied warranty.
-*/
-
-
-/*
- * NOTE:
- *		The interfaces for error-code-translation described in the rest of
- *		this file are preliminary in the 3.1 release of nspr and are subject 
- *		to change in future releases.
- */
-
-/*
-** Description:	Localizable error code to string function.
-**
-**
-** NSPR provides a mechanism for converting an error code to a
-** descriptive string, in a caller-specified language.
-**
-** Error codes themselves are 32 bit (signed) integers.  Typically,
-** the high order 24 bits are an identifier of which error table the
-** error code is from, and the low order 8 bits are a sequential error
-** number within the table.  NSPR supports error tables whose first
-** error code is not a multiple of 256, such error code assignments
-** should be avoided when possible.
-**
-** Error table 0 is defined to match the UNIX system call error table
-** (sys_errlist); this allows errno values to be used directly in the
-** library.  Other error table numbers are typically formed by
-** compacting together the first four characters of the error table
-** name.  The mapping between characters in the name and numeric
-** values in the error code are defined in a system-independent
-** fashion, so that two systems that can pass integral values between
-** them can reliably pass error codes without loss of meaning; this
-** should work even if the character sets used are not the
-** same. (However, if this is to be done, error table 0 should be
-** avoided, since the local system call error tables may differ.)
-**
-** Libraries defining error codes need only provide a table mapping
-** error code numbers to names and default English descriptions,
-** calling a routine to install the table, making it ``known'' to NSPR
-** library.  Once installed, a table may not be removed.  Any error
-** code the library generates can be converted to the corresponding
-** error message.  There is also a default format for error codes
-** accidentally returned before making the table known, which is of
-** the form "unknown code foo 32", where "foo" would be the name of
-** the table.
-**
-** Normally, the error code conversion routine only supports the
-** languages "i-default" and "en", returning the error-table-provided
-** English description for both languages.  The application may
-** provide a localization plugin, allowing support for additional
-** languages.
-**
-**/
-
-/**********************************************************************/
-/************************* TYPES AND CONSTANTS ************************/
-/**********************************************************************/
-
-/*
- * PRLanguageCode --
- *
- *    NSPR represents a language code as a non-negative integer.
- *    Languages 0 is always "i-default" the language you get without
- *    explicit negotiation.  Language 1 is always "en", English
- *    which has been explicitly negotiated.  Additional language
- *    codes are defined by an application-provided localization plugin.
- */
-typedef PRUint32 PRLanguageCode;
-#define PR_LANGUAGE_I_DEFAULT 0 /* i-default, the default language */
-#define PR_LANGUAGE_EN 1 /* English, explicitly negotiated */
-
-/*
- * struct PRErrorMessage --
- *
- *    An error message in an error table.
- */
-struct PRErrorMessage {
-    const char * name;    /* Macro name for error */
-    const char * en_text; /* Default English text */
-};
-
-/*
- * struct PRErrorTable --
- *
- *    An error table, provided by a library.
- */
-struct PRErrorTable {
-    const struct PRErrorMessage * msgs; /* Array of error information */
-    const char *name; /* Name of error table source */
-    PRErrorCode base; /* Error code for first error in table */
-    int n_msgs; /* Number of codes in table */
-};
-
-/*
- * struct PRErrorCallbackPrivate --
- *
- *    A private structure for the localization plugin 
- */
-struct PRErrorCallbackPrivate;
-
-/*
- * struct PRErrorCallbackTablePrivate --
- *
- *    A data structure under which the localization plugin may store information,
- *    associated with an error table, that is private to itself.
- */
-struct PRErrorCallbackTablePrivate;
-
-/*
- * PRErrorCallbackLookupFn --
- *
- *    A function of PRErrorCallbackLookupFn type is a localization
- *    plugin callback which converts an error code into a description
- *    in the requested language.  The callback is provided the
- *    appropriate error table, private data for the plugin and the table.
- *    The callback returns the appropriate UTF-8 encoded description, or NULL
- *    if no description can be found.
- */
-typedef const char *
-PRErrorCallbackLookupFn(PRErrorCode code, PRLanguageCode language, 
-		   const struct PRErrorTable *table,
-		   struct PRErrorCallbackPrivate *cb_private,
-		   struct PRErrorCallbackTablePrivate *table_private);
-
-/*
- * PRErrorCallbackNewTableFn --
- *
- *    A function PRErrorCallbackNewTableFn type is a localization plugin
- *    callback which is called once with each error table registered
- *    with NSPR.  The callback is provided with the error table and
- *    the plugin's private structure.  The callback returns any table private
- *    data it wishes to associate with the error table.  Does not need to be thread
- *    safe.
- */
-typedef struct PRErrorCallbackTablePrivate *
-PRErrorCallbackNewTableFn(const struct PRErrorTable *table,
-			struct PRErrorCallbackPrivate *cb_private);
-
-/**********************************************************************/
-/****************************** FUNCTIONS *****************************/
-/**********************************************************************/
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToString
-** DESCRIPTION:
-**  Returns the UTF-8 message for an error code in
-**  the requested language.  May return the message
-**  in the default language if a translation in the requested
-**  language is not available.  The returned string is
-**  valid for the duration of the process.  Never returns NULL.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToString(PRErrorCode code,
-    PRLanguageCode language);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorToName
-** DESCRIPTION:
-**  Returns the macro name for an error code, or NULL
-**  if the error code is not known.  The returned string is
-**  valid for the duration of the process.
-**
-**  Does not work for error table 0, the system error codes.
-**
-***********************************************************************/
-NSPR_API(const char *) PR_ErrorToName(PRErrorCode code);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorLanguages
-** DESCRIPTION:
-**  Returns the RFC 1766 language tags for the language
-**  codes PR_ErrorToString() supports.  The returned array is valid
-**  for the duration of the process.  Never returns NULL.  The first
-**  item in the returned array is the language tag for PRLanguageCode 0,
-**  the second is for PRLanguageCode 1, and so on.  The array is terminated
-**  with a null pointer.
-**
-***********************************************************************/
-NSPR_API(const char * const *) PR_ErrorLanguages(void);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallTable
-** DESCRIPTION:
-**  Registers an error table with NSPR.  Must be done exactly once per
-**  table.  Memory pointed to by `table' must remain valid for the life
-**  of the process.
-**
-**  NOT THREAD SAFE!
-**  
-***********************************************************************/
-NSPR_API(PRErrorCode) PR_ErrorInstallTable(const struct PRErrorTable *table);
-
-
-/***********************************************************************
-** FUNCTION:    PR_ErrorInstallCallback
-** DESCRIPTION:
-**  Registers an error localization plugin with NSPR.  May be called
-**  at most one time.  `languages' contains the language codes supported
-**  by this plugin.  Languages 0 and 1 must be "i-default" and "en"
-**  respectively.  `lookup' and `newtable' contain pointers to
-**  the plugin callback functions.  `cb_private' contains any information
-**  private to the plugin functions.
-**
-**  NOT THREAD SAFE!
-**
-***********************************************************************/
-NSPR_API(void) PR_ErrorInstallCallback(const char * const * languages,
-			      PRErrorCallbackLookupFn *lookup, 
-			      PRErrorCallbackNewTableFn *newtable,
-			      struct PRErrorCallbackPrivate *cb_private);
-
 PR_END_EXTERN_C
 
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.c
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.c	(revision 102203)
+++ 	(revision )
@@ -1,128 +1,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- *
- * prerr.c
- * This file is automatically generated; please do not edit it.
- */
-#include "prerror.h"
-static const struct PRErrorMessage text[] = {
-	{"PR_OUT_OF_MEMORY_ERROR",    "Memory allocation attempt failed"},
-	{"PR_BAD_DESCRIPTOR_ERROR",    "Invalid file descriptor"},
-	{"PR_WOULD_BLOCK_ERROR",    "The operation would have blocked"},
-	{"PR_ACCESS_FAULT_ERROR",    "Invalid memory address argument"},
-	{"PR_INVALID_METHOD_ERROR",    "Invalid function for file type"},
-	{"PR_ILLEGAL_ACCESS_ERROR",    "Invalid memory address argument"},
-	{"PR_UNKNOWN_ERROR",    "Some unknown error has occurred"},
-	{"PR_PENDING_INTERRUPT_ERROR",    "Operation interrupted by another thread"},
-	{"PR_NOT_IMPLEMENTED_ERROR",    "function not implemented"},
-	{"PR_IO_ERROR",    "I/O function error"},
-	{"PR_IO_TIMEOUT_ERROR",    "I/O operation timed out"},
-	{"PR_IO_PENDING_ERROR",    "I/O operation on busy file descriptor"},
-	{"PR_DIRECTORY_OPEN_ERROR",    "The directory could not be opened"},
-	{"PR_INVALID_ARGUMENT_ERROR",    "Invalid function argument"},
-	{"PR_ADDRESS_NOT_AVAILABLE_ERROR",    "Network address not available (in use?)"},
-	{"PR_ADDRESS_NOT_SUPPORTED_ERROR",    "Network address type not supported"},
-	{"PR_IS_CONNECTED_ERROR",    "Already connected"},
-	{"PR_BAD_ADDRESS_ERROR",    "Network address is invalid"},
-	{"PR_ADDRESS_IN_USE_ERROR",    "Local Network address is in use"},
-	{"PR_CONNECT_REFUSED_ERROR",    "Connection refused by peer"},
-	{"PR_NETWORK_UNREACHABLE_ERROR",    "Network address is presently unreachable"},
-	{"PR_CONNECT_TIMEOUT_ERROR",    "Connection attempt timed out"},
-	{"PR_NOT_CONNECTED_ERROR",    "Network file descriptor is not connected"},
-	{"PR_LOAD_LIBRARY_ERROR",    "Failure to load dynamic library"},
-	{"PR_UNLOAD_LIBRARY_ERROR",    "Failure to unload dynamic library"},
-	{"PR_FIND_SYMBOL_ERROR",    "Symbol not found in any of the loaded dynamic libraries"},
-	{"PR_INSUFFICIENT_RESOURCES_ERROR",    "Insufficient system resources"},
-	{"PR_DIRECTORY_LOOKUP_ERROR",    "A directory lookup on a network address has failed"},
-	{"PR_TPD_RANGE_ERROR",    "Attempt to access a TPD key that is out of range"},
-	{"PR_PROC_DESC_TABLE_FULL_ERROR",    "Process open FD table is full"},
-	{"PR_SYS_DESC_TABLE_FULL_ERROR",    "System open FD table is full"},
-	{"PR_NOT_SOCKET_ERROR",    "Network operation attempted on non-network file descriptor"},
-	{"PR_NOT_TCP_SOCKET_ERROR",    "TCP-specific function attempted on a non-TCP file descriptor"},
-	{"PR_SOCKET_ADDRESS_IS_BOUND_ERROR",    "TCP file descriptor is already bound"},
-	{"PR_NO_ACCESS_RIGHTS_ERROR",    "Access Denied"},
-	{"PR_OPERATION_NOT_SUPPORTED_ERROR",    "The requested operation is not supported by the platform"},
-	{"PR_PROTOCOL_NOT_SUPPORTED_ERROR",    "The host operating system does not support the protocol requested"},
-	{"PR_REMOTE_FILE_ERROR",    "Access to the remote file has been severed"},
-	{"PR_BUFFER_OVERFLOW_ERROR",    "The value requested is too large to be stored in the data buffer provided"},
-	{"PR_CONNECT_RESET_ERROR",    "TCP connection reset by peer"},
-	{"PR_RANGE_ERROR",    "Unused"},
-	{"PR_DEADLOCK_ERROR",    "The operation would have deadlocked"},
-	{"PR_FILE_IS_LOCKED_ERROR",    "The file is already locked"},
-	{"PR_FILE_TOO_BIG_ERROR",    "Write would result in file larger than the system allows"},
-	{"PR_NO_DEVICE_SPACE_ERROR",    "The device for storing the file is full"},
-	{"PR_PIPE_ERROR",    "Unused"},
-	{"PR_NO_SEEK_DEVICE_ERROR",    "Unused"},
-	{"PR_IS_DIRECTORY_ERROR",    "Cannot perform a normal file operation on a directory"},
-	{"PR_LOOP_ERROR",    "Symbolic link loop"},
-	{"PR_NAME_TOO_LONG_ERROR",    "File name is too long"},
-	{"PR_FILE_NOT_FOUND_ERROR",    "File not found"},
-	{"PR_NOT_DIRECTORY_ERROR",    "Cannot perform directory operation on a normal file"},
-	{"PR_READ_ONLY_FILESYSTEM_ERROR",    "Cannot write to a read-only file system"},
-	{"PR_DIRECTORY_NOT_EMPTY_ERROR",    "Cannot delete a directory that is not empty"},
-	{"PR_FILESYSTEM_MOUNTED_ERROR",    "Cannot delete or rename a file object while the file system is busy"},
-	{"PR_NOT_SAME_DEVICE_ERROR",    "Cannot rename a file to a file system on another device"},
-	{"PR_DIRECTORY_CORRUPTED_ERROR",    "The directory object in the file system is corrupted"},
-	{"PR_FILE_EXISTS_ERROR",    "Cannot create or rename a filename that already exists"},
-	{"PR_MAX_DIRECTORY_ENTRIES_ERROR",    "Directory is full.  No additional filenames may be added"},
-	{"PR_INVALID_DEVICE_STATE_ERROR",    "The required device was in an invalid state"},
-	{"PR_DEVICE_IS_LOCKED_ERROR",    "The device is locked"},
-	{"PR_NO_MORE_FILES_ERROR",    "No more entries in the directory"},
-	{"PR_END_OF_FILE_ERROR",    "Encountered end of file"},
-	{"PR_FILE_SEEK_ERROR",    "Seek error"},
-	{"PR_FILE_IS_BUSY_ERROR",    "The file is busy"},
-	{"PR_OPERATION_ABORTED_ERROR",    "The I/O operation was aborted"},
-	{"PR_IN_PROGRESS_ERROR",    "Operation is still in progress (probably a non-blocking connect)"},
-	{"PR_ALREADY_INITIATED_ERROR",    "Operation has already been initiated (probably a non-blocking connect)"},
-	{"PR_GROUP_EMPTY_ERROR",    "The wait group is empty"},
-	{"PR_INVALID_STATE_ERROR",    "Object state improper for request"},
-	{"PR_NETWORK_DOWN_ERROR",    "Network is down"},
-	{"PR_SOCKET_SHUTDOWN_ERROR",    "Socket shutdown"},
-	{"PR_CONNECT_ABORTED_ERROR",    "Connection aborted"},
-	{"PR_HOST_UNREACHABLE_ERROR",    "Host is unreachable"},
-	{"PR_LIBRARY_NOT_LOADED_ERROR",    "The library is not loaded"},
-	{"PR_MAX_ERROR",    "Placeholder for the end of the list"},
-	{0, 0}
-};
-
-static const struct PRErrorTable et = { text, "prerr", -6000L, 76 };
-
-void nspr_InitializePRErrorTable(void) {
-    PR_ErrorInstallTable(&et);
-}
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.et
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.et	(revision 102203)
+++ 	(revision )
@@ -1,135 +1,0 @@
-# 
-# The contents of this file are subject to the Mozilla Public
-# License Version 1.1 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-# 
-# Software distributed under the License is distributed on an "AS
-# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-# implied. See the License for the specific language governing
-# rights and limitations under the License.
-# 
-# The Original Code is the Netscape Portable Runtime (NSPR).
-# 
-# The Initial Developer of the Original Code is Netscape
-# Communications Corporation.  Portions created by Netscape are 
-# Copyright (C) 1998-2000 Netscape Communications Corporation.  All
-# Rights Reserved.
-# 
-# Contributor(s):
-# 
-# Alternatively, the contents of this file may be used under the
-# terms of the GNU General Public License Version 2 or later (the
-# "GPL"), in which case the provisions of the GPL are applicable 
-# instead of those above.  If you wish to allow use of your 
-# version of this file only under the terms of the GPL and not to
-# allow others to use your version of this file under the MPL,
-# indicate your decision by deleting the provisions above and
-# replace them with the notice and other provisions required by
-# the GPL.  If you do not delete the provisions above, a recipient
-# may use your version of this file under either the MPL or the
-# GPL.
-# 
-
-et nspr -6000
-
-ec PR_OUT_OF_MEMORY_ERROR,      "Memory allocation attempt failed"
-ec PR_BAD_DESCRIPTOR_ERROR,     "Invalid file descriptor"
-ec PR_WOULD_BLOCK_ERROR,        "The operation would have blocked"
-ec PR_ACCESS_FAULT_ERROR,       "Invalid memory address argument"
-ec PR_INVALID_METHOD_ERROR,     "Invalid function for file type"
-ec PR_ILLEGAL_ACCESS_ERROR,     "Invalid memory address argument"
-ec PR_UNKNOWN_ERROR,            "Some unknown error has occurred"
-ec PR_PENDING_INTERRUPT_ERROR,"Operation interrupted by another thread"
-ec PR_NOT_IMPLEMENTED_ERROR,    "function not implemented"
-ec PR_IO_ERROR,                 "I/O function error"
-ec PR_IO_TIMEOUT_ERROR,         "I/O operation timed out"
-ec PR_IO_PENDING_ERROR,         "I/O operation on busy file descriptor"
-ec PR_DIRECTORY_OPEN_ERROR,     "The directory could not be opened"
-ec PR_INVALID_ARGUMENT_ERROR, "Invalid function argument"
-ec PR_ADDRESS_NOT_AVAILABLE_ERROR, "Network address not available (in use?)"
-ec PR_ADDRESS_NOT_SUPPORTED_ERROR, "Network address type not supported"
-ec PR_IS_CONNECTED_ERROR,       "Already connected"
-ec PR_BAD_ADDRESS_ERROR,        "Network address is invalid"
-ec PR_ADDRESS_IN_USE_ERROR,     "Local Network address is in use"
-ec PR_CONNECT_REFUSED_ERROR,    "Connection refused by peer"
-ec PR_NETWORK_UNREACHABLE_ERROR, "Network address is presently unreachable"
-ec PR_CONNECT_TIMEOUT_ERROR,    "Connection attempt timed out"
-ec PR_NOT_CONNECTED_ERROR,      "Network file descriptor is not connected"
-ec PR_LOAD_LIBRARY_ERROR,       "Failure to load dynamic library"
-ec PR_UNLOAD_LIBRARY_ERROR,     "Failure to unload dynamic library"
-ec PR_FIND_SYMBOL_ERROR,
-"Symbol not found in any of the loaded dynamic libraries"
-ec PR_INSUFFICIENT_RESOURCES_ERROR, "Insufficient system resources"
-ec PR_DIRECTORY_LOOKUP_ERROR,
-"A directory lookup on a network address has failed"
-ec PR_TPD_RANGE_ERROR,
-"Attempt to access a TPD key that is out of range"
-ec PR_PROC_DESC_TABLE_FULL_ERROR, "Process open FD table is full"
-ec PR_SYS_DESC_TABLE_FULL_ERROR, "System open FD table is full"
-ec PR_NOT_SOCKET_ERROR,
-"Network operation attempted on non-network file descriptor"
-ec PR_NOT_TCP_SOCKET_ERROR,
-"TCP-specific function attempted on a non-TCP file descriptor"
-ec PR_SOCKET_ADDRESS_IS_BOUND_ERROR, "TCP file descriptor is already bound"
-ec PR_NO_ACCESS_RIGHTS_ERROR, "Access Denied"
-ec PR_OPERATION_NOT_SUPPORTED_ERROR,
-"The requested operation is not supported by the platform"
-ec PR_PROTOCOL_NOT_SUPPORTED_ERROR,
-"The host operating system does not support the protocol requested"
-ec PR_REMOTE_FILE_ERROR,        "Access to the remote file has been severed"
-ec PR_BUFFER_OVERFLOW_ERROR,
-"The value requested is too large to be stored in the data buffer provided"
-ec PR_CONNECT_RESET_ERROR,      "TCP connection reset by peer"
-ec PR_RANGE_ERROR,              "Unused"
-ec PR_DEADLOCK_ERROR,   "The operation would have deadlocked"
-ec PR_FILE_IS_LOCKED_ERROR,     "The file is already locked"
-ec PR_FILE_TOO_BIG_ERROR,
-"Write would result in file larger than the system allows"
-ec PR_NO_DEVICE_SPACE_ERROR,    "The device for storing the file is full"
-ec PR_PIPE_ERROR,               "Unused"
-ec PR_NO_SEEK_DEVICE_ERROR,     "Unused"
-ec PR_IS_DIRECTORY_ERROR,
-"Cannot perform a normal file operation on a directory"
-ec PR_LOOP_ERROR,               "Symbolic link loop"
-ec PR_NAME_TOO_LONG_ERROR,      "File name is too long"
-ec PR_FILE_NOT_FOUND_ERROR,     "File not found"
-ec PR_NOT_DIRECTORY_ERROR,
-"Cannot perform directory operation on a normal file"
-ec PR_READ_ONLY_FILESYSTEM_ERROR,
-"Cannot write to a read-only file system"
-ec PR_DIRECTORY_NOT_EMPTY_ERROR,
-"Cannot delete a directory that is not empty"
-ec PR_FILESYSTEM_MOUNTED_ERROR,
-"Cannot delete or rename a file object while the file system is busy"
-ec PR_NOT_SAME_DEVICE_ERROR,
-"Cannot rename a file to a file system on another device"
-ec PR_DIRECTORY_CORRUPTED_ERROR,
-"The directory object in the file system is corrupted"
-ec PR_FILE_EXISTS_ERROR,
-"Cannot create or rename a filename that already exists"
-ec PR_MAX_DIRECTORY_ENTRIES_ERROR,
-"Directory is full.  No additional filenames may be added"
-ec PR_INVALID_DEVICE_STATE_ERROR,
-"The required device was in an invalid state"
-ec PR_DEVICE_IS_LOCKED_ERROR, "The device is locked"
-ec PR_NO_MORE_FILES_ERROR,      "No more entries in the directory"
-ec PR_END_OF_FILE_ERROR,        "Encountered end of file"
-ec PR_FILE_SEEK_ERROR,  "Seek error"
-ec PR_FILE_IS_BUSY_ERROR,       "The file is busy"
-ec PR_OPERATION_ABORTED_ERROR,  "The I/O operation was aborted"
-ec PR_IN_PROGRESS_ERROR,
-"Operation is still in progress (probably a non-blocking connect)"
-ec PR_ALREADY_INITIATED_ERROR,
-"Operation has already been initiated (probably a non-blocking connect)"
-ec PR_GROUP_EMPTY_ERROR,        "The wait group is empty"
-ec PR_INVALID_STATE_ERROR,      "Object state improper for request"
-ec PR_NETWORK_DOWN_ERROR,       "Network is down"
-ec PR_SOCKET_SHUTDOWN_ERROR,    "Socket shutdown"
-ec PR_CONNECT_ABORTED_ERROR,    "Connection aborted"
-ec PR_HOST_UNREACHABLE_ERROR,   "Host is unreachable"
-ec PR_LIBRARY_NOT_LOADED_ERROR, "The library is not loaded"
-
-ec PR_MAX_ERROR,                "Placeholder for the end of the list"
-
-end
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.properties
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerr.properties	(revision 102203)
+++ 	(revision )
@@ -1,116 +1,0 @@
-# 
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is the Netscape Portable Runtime (NSPR).
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998-2000
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# prerr.properties
-# This file is automatically generated; please do not edit it.
-PR_OUT_OF_MEMORY_ERROR=Memory allocation attempt failed
-PR_BAD_DESCRIPTOR_ERROR=Invalid file descriptor
-PR_WOULD_BLOCK_ERROR=The operation would have blocked
-PR_ACCESS_FAULT_ERROR=Invalid memory address argument
-PR_INVALID_METHOD_ERROR=Invalid function for file type
-PR_ILLEGAL_ACCESS_ERROR=Invalid memory address argument
-PR_UNKNOWN_ERROR=Some unknown error has occurred
-PR_PENDING_INTERRUPT_ERROR=Operation interrupted by another thread
-PR_NOT_IMPLEMENTED_ERROR=function not implemented
-PR_IO_ERROR=I/O function error
-PR_IO_TIMEOUT_ERROR=I/O operation timed out
-PR_IO_PENDING_ERROR=I/O operation on busy file descriptor
-PR_DIRECTORY_OPEN_ERROR=The directory could not be opened
-PR_INVALID_ARGUMENT_ERROR=Invalid function argument
-PR_ADDRESS_NOT_AVAILABLE_ERROR=Network address not available (in use?)
-PR_ADDRESS_NOT_SUPPORTED_ERROR=Network address type not supported
-PR_IS_CONNECTED_ERROR=Already connected
-PR_BAD_ADDRESS_ERROR=Network address is invalid
-PR_ADDRESS_IN_USE_ERROR=Local Network address is in use
-PR_CONNECT_REFUSED_ERROR=Connection refused by peer
-PR_NETWORK_UNREACHABLE_ERROR=Network address is presently unreachable
-PR_CONNECT_TIMEOUT_ERROR=Connection attempt timed out
-PR_NOT_CONNECTED_ERROR=Network file descriptor is not connected
-PR_LOAD_LIBRARY_ERROR=Failure to load dynamic library
-PR_UNLOAD_LIBRARY_ERROR=Failure to unload dynamic library
-PR_FIND_SYMBOL_ERROR=Symbol not found in any of the loaded dynamic libraries
-PR_INSUFFICIENT_RESOURCES_ERROR=Insufficient system resources
-PR_DIRECTORY_LOOKUP_ERROR=A directory lookup on a network address has failed
-PR_TPD_RANGE_ERROR=Attempt to access a TPD key that is out of range
-PR_PROC_DESC_TABLE_FULL_ERROR=Process open FD table is full
-PR_SYS_DESC_TABLE_FULL_ERROR=System open FD table is full
-PR_NOT_SOCKET_ERROR=Network operation attempted on non-network file descriptor
-PR_NOT_TCP_SOCKET_ERROR=TCP-specific function attempted on a non-TCP file descriptor
-PR_SOCKET_ADDRESS_IS_BOUND_ERROR=TCP file descriptor is already bound
-PR_NO_ACCESS_RIGHTS_ERROR=Access Denied
-PR_OPERATION_NOT_SUPPORTED_ERROR=The requested operation is not supported by the platform
-PR_PROTOCOL_NOT_SUPPORTED_ERROR=The host operating system does not support the protocol requested
-PR_REMOTE_FILE_ERROR=Access to the remote file has been severed
-PR_BUFFER_OVERFLOW_ERROR=The value requested is too large to be stored in the data buffer provided
-PR_CONNECT_RESET_ERROR=TCP connection reset by peer
-PR_RANGE_ERROR=Unused
-PR_DEADLOCK_ERROR=The operation would have deadlocked
-PR_FILE_IS_LOCKED_ERROR=The file is already locked
-PR_FILE_TOO_BIG_ERROR=Write would result in file larger than the system allows
-PR_NO_DEVICE_SPACE_ERROR=The device for storing the file is full
-PR_PIPE_ERROR=Unused
-PR_NO_SEEK_DEVICE_ERROR=Unused
-PR_IS_DIRECTORY_ERROR=Cannot perform a normal file operation on a directory
-PR_LOOP_ERROR=Symbolic link loop
-PR_NAME_TOO_LONG_ERROR=File name is too long
-PR_FILE_NOT_FOUND_ERROR=File not found
-PR_NOT_DIRECTORY_ERROR=Cannot perform directory operation on a normal file
-PR_READ_ONLY_FILESYSTEM_ERROR=Cannot write to a read-only file system
-PR_DIRECTORY_NOT_EMPTY_ERROR=Cannot delete a directory that is not empty
-PR_FILESYSTEM_MOUNTED_ERROR=Cannot delete or rename a file object while the file system is busy
-PR_NOT_SAME_DEVICE_ERROR=Cannot rename a file to a file system on another device
-PR_DIRECTORY_CORRUPTED_ERROR=The directory object in the file system is corrupted
-PR_FILE_EXISTS_ERROR=Cannot create or rename a filename that already exists
-PR_MAX_DIRECTORY_ENTRIES_ERROR=Directory is full.  No additional filenames may be added
-PR_INVALID_DEVICE_STATE_ERROR=The required device was in an invalid state
-PR_DEVICE_IS_LOCKED_ERROR=The device is locked
-PR_NO_MORE_FILES_ERROR=No more entries in the directory
-PR_END_OF_FILE_ERROR=Encountered end of file
-PR_FILE_SEEK_ERROR=Seek error
-PR_FILE_IS_BUSY_ERROR=The file is busy
-PR_OPERATION_ABORTED_ERROR=The I/O operation was aborted
-PR_IN_PROGRESS_ERROR=Operation is still in progress (probably a non-blocking connect)
-PR_ALREADY_INITIATED_ERROR=Operation has already been initiated (probably a non-blocking connect)
-PR_GROUP_EMPTY_ERROR=The wait group is empty
-PR_INVALID_STATE_ERROR=Object state improper for request
-PR_NETWORK_DOWN_ERROR=Network is down
-PR_SOCKET_SHUTDOWN_ERROR=Socket shutdown
-PR_CONNECT_ABORTED_ERROR=Connection aborted
-PR_HOST_UNREACHABLE_ERROR=Host is unreachable
-PR_LIBRARY_NOT_LOADED_ERROR=The library is not loaded
-PR_MAX_ERROR=Placeholder for the end of the list
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerror.c
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerror.c	(revision 102203)
+++ trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerror.c	(revision 102207)
@@ -38,19 +38,4 @@
 #include "primpl.h"
 
-#include <string.h>
-#include <stdlib.h>
-
-PR_IMPLEMENT(PRErrorCode) PR_GetError(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->errorCode;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetOSError(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->osErrorCode;
-}
-
 PR_IMPLEMENT(void) PR_SetError(PRErrorCode code, PRInt32 osErr)
 {
@@ -60,48 +45,2 @@
     thread->errorStringLength = 0;
 }
-
-PR_IMPLEMENT(void) PR_SetErrorText(PRIntn textLength, const char *text)
-{
-    PRThread *thread = PR_GetCurrentThread();
-
-    if (0 == textLength)
-    {
-	    if (NULL != thread->errorString)
-	        PR_DELETE(thread->errorString);
-	    thread->errorStringSize = 0;
-    }
-    else
-    {
-	    PRIntn size = textLength + 31;  /* actual length to allocate. Plus a little extra */
-        if (thread->errorStringSize < textLength+1)  /* do we have room? */
-        {
-	        if (NULL != thread->errorString)
-	            PR_DELETE(thread->errorString);
-		    thread->errorString = (char*)PR_MALLOC(size);
-            if ( NULL == thread->errorString ) {
-                thread->errorStringSize = 0;
-                thread->errorStringLength = 0;
-                return;
-            }
-            thread->errorStringSize = size;
-	    }
-        memcpy(thread->errorString, text, textLength+1 );
-    }
-    thread->errorStringLength = textLength;
-}
-
-PR_IMPLEMENT(PRInt32) PR_GetErrorTextLength(void)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    return thread->errorStringLength;
-}  /* PR_GetErrorTextLength */
-
-PR_IMPLEMENT(PRInt32) PR_GetErrorText(char *text)
-{
-    PRThread *thread = PR_GetCurrentThread();
-    if (0 != thread->errorStringLength)
-        memcpy(text, thread->errorString, thread->errorStringLength+1);
-    return thread->errorStringLength;
-}  /* PR_GetErrorText */
-
-
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerrortable.c
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prerrortable.c	(revision 102203)
+++ 	(revision )
@@ -1,240 +1,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Netscape Portable Runtime (NSPR).
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998-2000
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-
-
-/*
-
-Copyright 1987, 1988 by the Student Information Processing Board
-	of the Massachusetts Institute of Technology
-
-Permission to use, copy, modify, and distribute this software
-and its documentation for any purpose and without fee is
-hereby granted, provided that the above copyright notice
-appear in all copies and that both that copyright notice and
-this permission notice appear in supporting documentation,
-and that the names of M.I.T. and the M.I.T. S.I.P.B. not be
-used in advertising or publicity pertaining to distribution
-of the software without specific, written prior permission.
-M.I.T. and the M.I.T. S.I.P.B. make no representations about
-the suitability of this software for any purpose.  It is
-provided "as is" without express or implied warranty.
-
-*/
-
-#include <string.h>
-#ifdef SUNOS4
-#include "md/sunos4.h"  /* for strerror */
-#endif
-#include <assert.h>
-#include <errno.h>
-#include "prmem.h"
-#include "prerror.h"
-
-#define	ERRCODE_RANGE	8	/* # of bits to shift table number */
-#define	BITS_PER_CHAR	6	/* # bits to shift per character in name */
-
-#ifdef NEED_SYS_ERRLIST
-extern char const * const sys_errlist[];
-extern const int sys_nerr;
-#endif
-
-/* List of error tables */
-struct PRErrorTableList {
-    struct PRErrorTableList *next;
-    const struct PRErrorTable *table;
-    struct PRErrorCallbackTablePrivate *table_private;
-};
-static struct PRErrorTableList * Table_List = (struct PRErrorTableList *) NULL;
-
-/* Supported languages */
-static const char * default_languages[] = { "i-default", "en", 0 };
-static const char * const * callback_languages = default_languages;
-
-/* Callback info */
-static struct PRErrorCallbackPrivate *callback_private = 0;
-static PRErrorCallbackLookupFn *callback_lookup = 0;
-static PRErrorCallbackNewTableFn *callback_newtable = 0;
-
-
-static const char char_set[] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_";
-
-static const char *
-error_table_name (PRErrorCode num)
-{
-    static char buf[6];	/* only used if internal code problems exist */
-
-    long ch;
-    int i;
-    char *p;
-
-    /* num = aa aaa abb bbb bcc ccc cdd ddd d?? ??? ??? */
-    p = buf;
-    num >>= ERRCODE_RANGE;
-    /* num = ?? ??? ??? aaa aaa bbb bbb ccc ccc ddd ddd */
-    num &= 077777777;
-    /* num = 00 000 000 aaa aaa bbb bbb ccc ccc ddd ddd */
-    for (i = 4; i >= 0; i--) {
-	ch = (num >> BITS_PER_CHAR * i) & ((1 << BITS_PER_CHAR) - 1);
-	if (ch != 0)
-	    *p++ = char_set[ch-1];
-    }
-    *p = '\0';
-    return(buf);
-}
-
-PR_IMPLEMENT(const char *)
-PR_ErrorToString(PRErrorCode code, PRLanguageCode language)
-{
-    /* static buffer only used if code is using inconsistent error message
-     * numbers, so just ignore the possible thread contention
-     */
-    static char buffer[25];
-
-    const char *msg;
-    int offset;
-    PRErrorCode table_num;
-    struct PRErrorTableList *et;
-    int started = 0;
-    char *cp;
-
-    for (et = Table_List; et; et = et->next) {
-	if (et->table->base <= code &&
-	    et->table->base + et->table->n_msgs > code) {
-	    /* This is the right table */
-	    if (callback_lookup) {
-		msg = callback_lookup(code, language, et->table,
-		    callback_private, et->table_private);
-		if (msg) return msg;
-	    }
-    
-	    return(et->table->msgs[code - et->table->base].en_text);
-	}
-    }
-
-    if (code >= 0 && code < 256) {
-	return strerror(code);
-    }
-
-    offset = (int) (code & ((1<<ERRCODE_RANGE)-1));
-    table_num = code - offset;
-    strcpy (buffer, "Unknown code ");
-    if (table_num) {
-	strcat(buffer, error_table_name (table_num));
-	strcat(buffer, " ");
-    }
-    for (cp = buffer; *cp; cp++)
-	;
-    if (offset >= 100) {
-	*cp++ = (char)('0' + offset / 100);
-	offset %= 100;
-	started++;
-    }
-    if (started || offset >= 10) {
-	*cp++ = (char)('0' + offset / 10);
-	offset %= 10;
-    }
-    *cp++ = (char)('0' + offset);
-    *cp = '\0';
-    return(buffer);
-}
-
-PR_IMPLEMENT(const char *)
-PR_ErrorToName(PRErrorCode code)
-{
-    struct PRErrorTableList *et;
-
-    for (et = Table_List; et; et = et->next) {
-	if (et->table->base <= code &&
-	    et->table->base + et->table->n_msgs > code) {
-	    /* This is the right table */
-	    return(et->table->msgs[code - et->table->base].name);
-	}
-    }
-
-    return 0;
-}
-
-PR_IMPLEMENT(const char * const *)
-PR_ErrorLanguages(void)
-{
-    return callback_languages;
-}
-
-PR_IMPLEMENT(PRErrorCode)
-PR_ErrorInstallTable(const struct PRErrorTable *table)
-{
-    struct PRErrorTableList * new_et;
-
-    new_et = (struct PRErrorTableList *)
-					PR_Malloc(sizeof(struct PRErrorTableList));
-    if (!new_et)
-	return errno;	/* oops */
-    new_et->table = table;
-    if (callback_newtable) {
-	new_et->table_private = callback_newtable(table, callback_private);
-    } else {
-	new_et->table_private = 0;
-    }
-    new_et->next = Table_List;
-    Table_List = new_et;
-    return 0;
-}
-
-PR_IMPLEMENT(void)
-PR_ErrorInstallCallback(const char * const * languages,
-		       PRErrorCallbackLookupFn *lookup, 
-		       PRErrorCallbackNewTableFn *newtable,
-		       struct PRErrorCallbackPrivate *cb_private)
-{
-    struct PRErrorTableList *et;
-
-    assert(strcmp(languages[0], "i-default") == 0);
-    assert(strcmp(languages[1], "en") == 0);
-    
-    callback_languages = languages;
-    callback_lookup = lookup;
-    callback_newtable = newtable;
-    callback_private = cb_private;
-
-    if (callback_newtable) {
-	for (et = Table_List; et; et = et->next) {
-	    et->table_private = callback_newtable(et->table, callback_private);
-	}
-    }
-}
Index: trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c
===================================================================
--- trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c	(revision 102203)
+++ trunk/src/libs/xpcom18a4/nsprpub/pr/src/misc/prinit.c	(revision 102207)
@@ -78,6 +78,4 @@
     _PR_InitThreads(PR_USER_THREAD, PR_PRIORITY_NORMAL, 0);
 
-    nspr_InitializePRErrorTable();
-
     _PR_MD_FINAL_INIT();
 }
