wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 3333c226a1d8 (bug 792989) for wrong commit number

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2014-10-30 14:39:15 +01:00
parent 409a273237
commit 220b6af50e
3 changed files with 0 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
xpcom/base/ErrorNames.cpp
View File

@ -1,83 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/ArrayUtils.h"
#include "mozilla/ErrorNames.h"
#include "nsString.h"
#include "prerror.h"
namespace {
struct ErrorEntry
{
nsresult value;
const char * name;
};
#undef ERROR
#define ERROR(key, val) {key, #key}
const ErrorEntry errors[] = {
#include "ErrorList.h"
};
#undef ERROR
} // unnamed namespace
namespace mozilla {
void
GetErrorName(nsresult rv, nsACString& name)
{
for (size_t i = 0; i < ArrayLength(errors); ++i) {
if (errors[i].value == rv) {
name.AssignASCII(errors[i].name);
return;
}
}
bool isSecurityError = NS_ERROR_GET_MODULE(rv) == NS_ERROR_MODULE_SECURITY;
// NS_ERROR_MODULE_SECURITY is the only module that is "allowed" to
// synthesize nsresult error codes that are not listed in ErrorList.h. (The
// NS_ERROR_MODULE_SECURITY error codes are synthesized from NSPR error
// codes.)
MOZ_ASSERT(isSecurityError);
name.AssignASCII(NS_SUCCEEDED(rv) ? "NS_ERROR_GENERATE_SUCCESS("
: "NS_ERROR_GENERATE_FAILURE(");
if (isSecurityError) {
name.AppendASCII("NS_ERROR_MODULE_SECURITY");
} else {
// This should never happen given the assertion above, so we don't bother
// trying to print a symbolic name for the module here.
name.AppendInt(NS_ERROR_GET_MODULE(rv));
}
name.AppendASCII(", ");
const char * nsprName = nullptr;
if (isSecurityError) {
// Invert the logic from NSSErrorsService::GetXPCOMFromNSSError
PRErrorCode nsprCode
= -1 * static_cast<PRErrorCode>(NS_ERROR_GET_CODE(rv));
nsprName = PR_ErrorToName(nsprCode);
// All NSPR error codes defined by NSPR or NSS should have a name mapping.
MOZ_ASSERT(nsprName);
}
if (nsprName) {
name.AppendASCII(nsprName);
} else {
name.AppendInt(NS_ERROR_GET_CODE(rv));
}
name.AppendASCII(")");
}
} // namespace mozilla

24
xpcom/base/ErrorNames.h
View File

@ -1,24 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#ifndef mozilla_ErrorNames_h
#define mozilla_ErrorNames_h
#include "nsError.h"
class nsACString;
namespace mozilla {
// Maps the given nsresult to its symbolic name. For example,
// GetErrorName(NS_OK, name) will result in name == "NS_OK".
// When the symbolic name is unknown, name will be of the form
// "NS_ERROR_GENERATE_SUCCESS(<module>, <code>)" or
// "NS_ERROR_GENERATE_FAILURE(<module>, <code>)".
void GetErrorName(nsresult rv, nsACString& name);
}
#endif // mozilla_ErrorNames_h

2
xpcom/base/moz.build
View File

@ -76,7 +76,6 @@ EXPORTS.mozilla += [
'CountingAllocatorBase.h',
'CycleCollectedJSRuntime.h',
'Debug.h',
'ErrorNames.h',
'LinuxUtils.h',
'nsMemoryInfoDumper.h',
'StackWalk.h',
@ -98,7 +97,6 @@ UNIFIED_SOURCES += [
'ClearOnShutdown.cpp',
'CycleCollectedJSRuntime.cpp',
'Debug.cpp',
'ErrorNames.cpp',
'nsConsoleMessage.cpp',
'nsConsoleService.cpp',
'nsCycleCollector.cpp',