Bug 769265 - Fix these calls. r=bent a=lsblakk
authorBlake Kaplan <mrbkap@gmail.com>
Thu, 28 Jun 2012 16:14:11 +0200
changeset 100392 a3391345c86a59b737c8153c3eb724f0fe6333e1
parent 100391 6932a40200a32345a232e5144cb8f25dac5f3d84
child 100393 65f7a05712a0cb7608265a79cb3b5ad4535c8fb9
push id1199
push usermrbkap@mozilla.com
push dateTue, 31 Jul 2012 01:03:33 +0000
treeherdermozilla-beta@a3391345c86a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbent, lsblakk
bugs769265
milestone15.0
Bug 769265 - Fix these calls. r=bent a=lsblakk
content/base/src/nsFrameMessageManager.cpp
dom/workers/WorkerPrivate.cpp
dom/workers/WorkerScope.cpp
js/xpconnect/loader/mozJSComponentLoader.cpp
js/xpconnect/shell/xpcshell.cpp
--- a/content/base/src/nsFrameMessageManager.cpp
+++ b/content/base/src/nsFrameMessageManager.cpp
@@ -249,17 +249,17 @@ nsFrameMessageManager::SendAsyncMessage(
   }
   return SendAsyncMessageInternal(aMessageName, json);
 }
 
 NS_IMETHODIMP
 nsFrameMessageManager::Dump(const nsAString& aStr)
 {
 #ifdef ANDROID
-  __android_log_print(ANDROID_LOG_INFO, "Gecko", NS_ConvertUTF16toUTF8(aStr).get());
+  __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", NS_ConvertUTF16toUTF8(aStr).get());
 #endif
   fputs(NS_ConvertUTF16toUTF8(aStr).get(), stdout);
   fflush(stdout);
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsFrameMessageManager::PrivateNoteIntentionalCrash()
--- a/dom/workers/WorkerPrivate.cpp
+++ b/dom/workers/WorkerPrivate.cpp
@@ -1228,17 +1228,17 @@ public:
       else {
         NS_WARNING("Failed to log script error!");
       }
     }
 
     if (!logged) {
       NS_ConvertUTF16toUTF8 msg(aMessage);
 #ifdef ANDROID
-      __android_log_print(ANDROID_LOG_INFO, "Gecko", msg.get());
+      __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", msg.get());
 #endif
       fputs(msg.get(), stderr);
       fflush(stderr);
     }
 
     return true;
   }
 };
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -537,17 +537,17 @@ private:
       }
 
       JSAutoByteString buffer(aCx, str);
       if (!buffer) {
         return false;
       }
 
 #ifdef ANDROID
-      __android_log_print(ANDROID_LOG_INFO, "Gecko", buffer.ptr());
+      __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", buffer.ptr());
 #endif
       fputs(buffer.ptr(), stdout);
       fflush(stdout);
     }
 
     return true;
   }
 
--- a/js/xpconnect/loader/mozJSComponentLoader.cpp
+++ b/js/xpconnect/loader/mozJSComponentLoader.cpp
@@ -170,17 +170,17 @@ Dump(JSContext *cx, unsigned argc, jsval
 
     size_t length;
     const jschar *chars = JS_GetStringCharsAndLength(cx, str, &length);
     if (!chars)
         return false;
 
     NS_ConvertUTF16toUTF8 utf8str(reinterpret_cast<const PRUnichar*>(chars));
 #ifdef ANDROID
-    __android_log_print(ANDROID_LOG_INFO, "Gecko", utf8str.get());
+    __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", utf8str.get());
 #endif
     fputs(utf8str.get(), stdout);
     fflush(stdout);
     return true;
 }
 
 static JSBool
 Debug(JSContext *cx, unsigned argc, jsval *vp)
--- a/js/xpconnect/shell/xpcshell.cpp
+++ b/js/xpconnect/shell/xpcshell.cpp
@@ -419,17 +419,17 @@ Dump(JSContext *cx, unsigned argc, jsval
     if (!str)
         return false;
 
     JSAutoByteString bytes(cx, str);
     if (!bytes)
         return false;
 
 #ifdef ANDROID
-    __android_log_print(ANDROID_LOG_INFO, "Gecko", bytes.ptr());
+    __android_log_print(ANDROID_LOG_INFO, "Gecko", "%s", bytes.ptr());
 #endif
     fputs(bytes.ptr(), gOutFile);
     fflush(gOutFile);
     return true;
 }
 
 static JSBool
 Load(JSContext *cx, unsigned argc, jsval *vp)