Bug 1060419 - make nsPluginsDirWin.cpp use Printf.h, r?froydnj draft
authorTom Tromey <tom@tromey.com>
Fri, 09 Dec 2016 10:11:38 -1000
changeset 486145 dcce3412b5d009fd1399bd3bda6e552ee11f1104
parent 486144 f1893ac08710b26bf29b5e1ac9edb52976737af4
child 486146 54791195eb819298b4ee8cb4f9f8fe7124fd0f3b
push id45909
push userbmo:ttromey@mozilla.com
push dateFri, 17 Feb 2017 16:00:11 +0000
reviewersfroydnj
bugs1060419
milestone54.0a1
Bug 1060419 - make nsPluginsDirWin.cpp use Printf.h, r?froydnj MozReview-Commit-ID: DEp62fnUggc
dom/plugins/base/nsPluginsDirWin.cpp
--- a/dom/plugins/base/nsPluginsDirWin.cpp
+++ b/dom/plugins/base/nsPluginsDirWin.cpp
@@ -8,22 +8,22 @@
   
   Windows implementation of the nsPluginsDir/nsPluginsFile classes.
   
   by Alex Musil
  */
 
 #include "mozilla/ArrayUtils.h" // ArrayLength
 #include "mozilla/DebugOnly.h"
+#include "mozilla/Printf.h"
 
 #include "nsPluginsDir.h"
 #include "prlink.h"
 #include "plstr.h"
 #include "prmem.h"
-#include "prprf.h"
 
 #include "windows.h"
 #include "winbase.h"
 
 #include "nsString.h"
 #include "nsIFile.h"
 #include "nsUnicharUtils.h"
 
@@ -94,21 +94,21 @@ static char* GetKeyValue(void* verbuf, c
 static char* GetVersion(void* verbuf)
 {
   VS_FIXEDFILEINFO *fileInfo;
   UINT fileInfoLen;
 
   ::VerQueryValueW(verbuf, L"\\", (void **)&fileInfo, &fileInfoLen);
 
   if (fileInfo) {
-    return PR_smprintf("%ld.%ld.%ld.%ld",
-                       HIWORD(fileInfo->dwFileVersionMS),
-                       LOWORD(fileInfo->dwFileVersionMS),
-                       HIWORD(fileInfo->dwFileVersionLS),
-                       LOWORD(fileInfo->dwFileVersionLS));
+    return mozilla::Smprintf("%ld.%ld.%ld.%ld",
+                      HIWORD(fileInfo->dwFileVersionMS),
+                      LOWORD(fileInfo->dwFileVersionMS),
+                      HIWORD(fileInfo->dwFileVersionLS),
+                      LOWORD(fileInfo->dwFileVersionLS));
   }
 
   return nullptr;
 }
 
 // Returns a boolean indicating if the key's value contains a string
 // entry equal to "1" or "0". No entry for the key returns false.
 static bool GetBooleanFlag(void* verbuf, const WCHAR* key,
@@ -420,14 +420,14 @@ nsresult nsPluginFile::FreePluginInfo(ns
 
   if (info.fFullPath)
     PL_strfree(info.fFullPath);
 
   if (info.fFileName)
     PL_strfree(info.fFileName);
 
   if (info.fVersion)
-    PR_smprintf_free(info.fVersion);
+    mozilla::SmprintfFree(info.fVersion);
 
   ZeroMemory((void *)&info, sizeof(info));
 
   return NS_OK;
 }