Backed out changeset 814e0d966842 (bug 1544511) for linux build bustages at Assertions.h:344:73: error: format '%d' expects argument of type 'int'. CLOSED TREE
authorBrindusan Cristian <cbrindusan@mozilla.com>
Tue, 30 Apr 2019 03:13:05 +0300
changeset 530660 6b6600f6781c585371dd334b26ca1a6623c29e28
parent 530659 d89587999df100be804a749694ac08fffd5ab39d
child 530661 91ac1bb728ef0c25e230bae50297794dd631f8f6
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1544511
milestone68.0a1
backs out814e0d96684235d7e6a2024b9da8e8a0acbe6d59
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 814e0d966842 (bug 1544511) for linux build bustages at Assertions.h:344:73: error: format '%d' expects argument of type 'int'. CLOSED TREE
security/manager/ssl/nsNSSComponent.cpp
--- a/security/manager/ssl/nsNSSComponent.cpp
+++ b/security/manager/ssl/nsNSSComponent.cpp
@@ -1571,22 +1571,16 @@ static void MaybeCleanUpOldNSSFiles(cons
 // we can skip the FIPS workaround since it was never possible to enable FIPS
 // there anyway.
 static nsresult InitializeNSSWithFallbacks(const nsACString& profilePath,
                                            bool nocertdb, bool safeMode) {
   if (nocertdb || profilePath.IsEmpty()) {
     MOZ_LOG(gPIPNSSLog, LogLevel::Debug,
             ("nocertdb mode or empty profile path -> NSS_NoDB_Init"));
     SECStatus srv = NSS_NoDB_Init(nullptr);
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-    if (srv != SECSuccess) {
-      MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
-                              PR_GetError());
-    }
-#endif
     return srv == SECSuccess ? NS_OK : NS_ERROR_FAILURE;
   }
 
   // Try read/write mode. If we're in safeMode, we won't load PKCS#11 modules.
 #ifndef ANDROID
   PRErrorCode savedPRErrorCode1;
 #endif  // ifndef ANDROID
   SECStatus srv = ::mozilla::psm::InitializeNSS(profilePath, false, !safeMode);
@@ -1630,31 +1624,24 @@ static nsresult InitializeNSSWithFallbac
     // flags causes NSS initialization to fail, so unfortunately we have to use
     // read-write mode.
     srv = ::mozilla::psm::InitializeNSS(profilePath, false, false);
     if (srv == SECSuccess) {
       MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("FIPS may be the problem"));
       // Unload NSS so we can attempt to fix this situation for the user.
       srv = NSS_Shutdown();
       if (srv != SECSuccess) {
-#  ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-        MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
-                                PR_GetError());
-#  endif
         return NS_ERROR_FAILURE;
       }
       MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("trying to rename module db"));
       // If this fails non-catastrophically, we'll attempt to initialize NSS
       // again in r/w then r-o mode (both of which will fail), and then we'll
       // fall back to NSS_NoDB_Init, which is the behavior we want.
       nsresult rv = AttemptToRenameBothPKCS11ModuleDBVersions(profilePath);
       if (NS_FAILED(rv)) {
-#  ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-        MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d", rv);
-#  endif
         return rv;
       }
       srv = ::mozilla::psm::InitializeNSS(profilePath, false, true);
       if (srv == SECSuccess) {
         MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("initialized in r/w mode"));
         return NS_OK;
       }
       srv = ::mozilla::psm::InitializeNSS(profilePath, true, true);
@@ -1663,22 +1650,16 @@ static nsresult InitializeNSSWithFallbac
         return NS_OK;
       }
     }
   }
 #endif
 
   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("last-resort NSS_NoDB_Init"));
   srv = NSS_NoDB_Init(nullptr);
-#ifdef MOZ_DIAGNOSTIC_ASSERT_ENABLED
-  if (srv != SECSuccess) {
-    MOZ_CRASH_UNSAFE_PRINTF("InitializeNSSWithFallbacks failed: %d",
-                            PR_GetError());
-  }
-#endif
   return srv == SECSuccess ? NS_OK : NS_ERROR_FAILURE;
 }
 
 nsresult nsNSSComponent::InitializeNSS() {
   MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("nsNSSComponent::InitializeNSS\n"));
 
   static_assert(
       nsINSSErrorsService::NSS_SEC_ERROR_BASE == SEC_ERROR_BASE &&