bug 832052 - log nss library load failures r=glandium
☠☠ backed out by 702c98ac2167 ☠ ☠
authorBrad Lassey <blassey@mozilla.com>
Tue, 17 Dec 2013 21:11:28 -0500
changeset 161008 ffcd46c7e8eb3532fecb1a97ecddb6cb5cd83696
parent 161007 12d601c7f0ef1f6dfaf207b4e5948fd349b02ce5
child 161009 702c98ac2167b5540172dcef8f98890b31ee2385
push id3372
push usercbook@mozilla.com
push dateWed, 18 Dec 2013 12:06:28 +0000
treeherderb2g-inbound@0758d09c0962 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs832052
milestone29.0a1
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 " #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 " #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 " #name);  return FAILURE; }
   PLCFUNC(PL_Base64Encode);
   PLCFUNC(PL_Base64Decode);
   PLCFUNC(PL_strfree);
 #undef PLCFUNC
 
   return SUCCESS;
 }