Backed out changeset 9ab60c44a510 (bug 832052) for breaking android 2.2 debug builds
authorWes Kocher <wkocher@mozilla.com>
Tue, 17 Dec 2013 21:13:35 -0800
changeset 171221 195453582f94feb1afbd9d3b70d1e6a098e6d427
parent 171220 3fab9a65035e04eb09eaaea0bf83179eea6761d6
child 171222 eaadc30df6e7378209bdfb683d5a7a586854b4cb
push idunknown
push userunknown
push dateunknown
bugs832052
milestone29.0a1
backs out9ab60c44a51013884a81ea92c61e4d0ad832e1c3
Backed out changeset 9ab60c44a510 (bug 832052) for breaking android 2.2 debug builds
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) { LOG( "missing %s", name);  return FAILURE; }
+                      if (!f_ ##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) { LOG( "missing %s", name);  return FAILURE; }
+                       if (!f_ ##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) { LOG( "missing %s", name);  return FAILURE; }
+                      if (!f_ ##name) return FAILURE;
   PLCFUNC(PL_Base64Encode);
   PLCFUNC(PL_Base64Decode);
   PLCFUNC(PL_strfree);
 #undef PLCFUNC
 
   return SUCCESS;
 }