Bug 1060419 - make nsHttpHandler.cpp use Printf.h, r?froydnj
MozReview-Commit-ID: 5oMUmsrQV3k
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -23,17 +23,17 @@
#include "nsIPrefService.h"
#include "nsIPrefBranch.h"
#include "nsIPrefLocalizedString.h"
#include "nsISocketProviderService.h"
#include "nsISocketProvider.h"
#include "nsPrintfCString.h"
#include "nsCOMPtr.h"
#include "nsNetCID.h"
-#include "prprf.h"
+#include "mozilla/Printf.h"
#include "mozilla/Sprintf.h"
#include "nsAsyncRedirectVerifyHelper.h"
#include "nsSocketTransportService2.h"
#include "nsAlgorithm.h"
#include "ASpdySession.h"
#include "EventTokenBucket.h"
#include "Tickler.h"
#include "nsIXULAppInfo.h"
@@ -874,22 +874,22 @@ nsHttpHandler::InitUserAgentComponents()
BOOL isWow64 = FALSE;
if (!IsWow64Process(GetCurrentProcess(), &isWow64)) {
isWow64 = FALSE;
}
format = isWow64
? WNT_BASE "; WOW64"
: WNT_BASE;
#endif
- char *buf = PR_smprintf(format,
- info.dwMajorVersion,
- info.dwMinorVersion);
+ char *buf = mozilla::Smprintf(format,
+ info.dwMajorVersion,
+ info.dwMinorVersion);
if (buf) {
mOscpu = buf;
- PR_smprintf_free(buf);
+ mozilla::SmprintfFree(buf);
}
}
#elif defined (XP_MACOSX)
#if defined(__ppc__)
mOscpu.AssignLiteral("PPC Mac OS X");
#elif defined(__i386__) || defined(__x86_64__)
mOscpu.AssignLiteral("Intel Mac OS X");
#endif