Backed out changeset ffcd46c7e8eb, forgot to refresh
authorBrad Lassey <blassey@mozilla.com>
Tue, 17 Dec 2013 23:06:55 -0500
changeset 177015 702c98ac2167b5540172dcef8f98890b31ee2385
parent 177014 ffcd46c7e8eb3532fecb1a97ecddb6cb5cd83696
child 177016 9ab60c44a51013884a81ea92c61e4d0ad832e1c3
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)
milestone29.0a1
backs outffcd46c7e8eb3532fecb1a97ecddb6cb5cd83696
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 ffcd46c7e8eb, forgot to refresh
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 " #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 " #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 " #name);  return FAILURE; }
+                      if (!f_ ##name) return FAILURE;
   PLCFUNC(PL_Base64Encode);
   PLCFUNC(PL_Base64Decode);
   PLCFUNC(PL_strfree);
 #undef PLCFUNC
 
   return SUCCESS;
 }