bug 832052 - log nss library load failures r=glandium
☠☠ backed out by 195453582f94 ☠ ☠
authorBrad Lassey <blassey@mozilla.com>
Tue, 17 Dec 2013 23:07:30 -0500
changeset 177016 9ab60c44a51013884a81ea92c61e4d0ad832e1c3
parent 177015 702c98ac2167b5540172dcef8f98890b31ee2385
child 177017 c4921ed6aef3274fb85955c5351237619d4ba0c9
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs832052
milestone29.0a1
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
bug 832052 - log nss library load failures r=glandium
mozglue/android/NSSBridge.cpp
--- a/mozglue/android/NSSBridge.cpp
+++ b/mozglue/android/NSSBridge.cpp
@@ -49,34 +49,34 @@ setup_nss_functions(void *nss_handle,
                         void *nspr_handle,
                         void *plc_handle)
 {
   if (nss_handle == nullptr || nspr_handle == nullptr || plc_handle == nullptr) {
     LOG("Missing handle\n");
     return FAILURE;
   }
 #define GETFUNC(name) f_ ## name = (name ## _t) (uintptr_t) __wrap_dlsym(nss_handle, #name); \
-                      if (!f_ ##name) return FAILURE;
+  if (!f_ ##name) { LOG( "missing %s", name);  return FAILURE; }
   GETFUNC(NSS_Initialize);
   GETFUNC(NSS_Shutdown);
   GETFUNC(PK11SDR_Encrypt);
   GETFUNC(PK11SDR_Decrypt);
   GETFUNC(PK11_GetInternalKeySlot);
   GETFUNC(PK11_NeedUserInit);
   GETFUNC(PK11_InitPin);
   GETFUNC(SECITEM_ZfreeItem);
 #undef GETFUNC
 #define NSPRFUNC(name) f_ ## name = (name ## _t) (uintptr_t) __wrap_dlsym(nspr_handle, #name); \
-                       if (!f_ ##name) return FAILURE;
+  if (!f_ ##name) { LOG( "missing %s", name);  return FAILURE; }
   NSPRFUNC(PR_ErrorToString);
   NSPRFUNC(PR_GetError);
   NSPRFUNC(PR_Free);
 #undef NSPRFUNC
 #define PLCFUNC(name) f_ ## name = (name ## _t) (uintptr_t) __wrap_dlsym(plc_handle, #name); \
-                      if (!f_ ##name) return FAILURE;
+  if (!f_ ##name) { LOG( "missing %s", name);  return FAILURE; }
   PLCFUNC(PL_Base64Encode);
   PLCFUNC(PL_Base64Decode);
   PLCFUNC(PL_strfree);
 #undef PLCFUNC
 
   return SUCCESS;
 }