Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-27 23:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1402519 - Remove MOZ_CRASHREPORTER directives from storage; r=mak

Browse Source 
MozReview-Commit-ID: HYpSWoJaEAm

--HG--
extra : rebase_source : 63f8a24c71a93ea14eb9c4f5411fb7f2ca12d661
This commit is contained in:
Gabriele Svelto 2017-10-20 11:00:21 +02:00
parent 80fbb39861
commit 4a5642e26f
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
storage/mozStorageService.cpp
View File

@ -12,6 +12,7 @@
#include "nsAutoPtr.h" #include "nsAutoPtr.h"
#include "nsCollationCID.h" #include "nsCollationCID.h"
#include "nsEmbedCID.h" #include "nsEmbedCID.h"
#include "nsExceptionHandler.h"
#include "nsThreadUtils.h" #include "nsThreadUtils.h"
#include "mozStoragePrivateHelpers.h" #include "mozStoragePrivateHelpers.h"
#include "nsIXPConnect.h" #include "nsIXPConnect.h"
@ -26,10 +27,6 @@
#include "sqlite3.h" #include "sqlite3.h"
#include "mozilla/AutoSQLiteLifetime.h" #include "mozilla/AutoSQLiteLifetime.h"
#ifdef MOZ_CRASHREPORTER
#include "nsExceptionHandler.h"
#endif
#ifdef XP_WIN #ifdef XP_WIN
// "windows.h" was included and it can #define lots of things we care about... // "windows.h" was included and it can #define lots of things we care about...
#undef CompareString #undef CompareString
@ -801,13 +798,11 @@ Service::Observe(nsISupports *, const char *aTopic, const char16_t *)
getConnections(connections); getConnections(connections);
for (uint32_t i = 0, n = connections.Length(); i < n; i++) { for (uint32_t i = 0, n = connections.Length(); i < n; i++) {
if (!connections[i]->isClosed()) { if (!connections[i]->isClosed()) {
#ifdef MOZ_CRASHREPORTER
// getFilename is only the leaf name for the database file, // getFilename is only the leaf name for the database file,
// so it shouldn't contain privacy-sensitive information. // so it shouldn't contain privacy-sensitive information.
CrashReporter::AnnotateCrashReport( CrashReporter::AnnotateCrashReport(
NS_LITERAL_CSTRING("StorageConnectionNotClosed"), NS_LITERAL_CSTRING("StorageConnectionNotClosed"),
connections[i]->getFilename()); connections[i]->getFilename());
#endif
#ifdef DEBUG #ifdef DEBUG
printf_stderr("Storage connection not closed: %s", printf_stderr("Storage connection not closed: %s",
connections[i]->getFilename().get()); connections[i]->getFilename().get());