Bug 978851 - LoadInfo::UpdateSystemLoad warns about format string in sscanf. r=padenot
--- a/content/media/webrtc/LoadMonitor.cpp
+++ b/content/media/webrtc/LoadMonitor.cpp
@@ -4,16 +4,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "LoadMonitor.h"
#include "nsString.h"
#include "prlog.h"
#include "prtime.h"
#include "prinrval.h"
#include "prsystem.h"
+#include "prprf.h"
#include "nsString.h"
#include "nsThreadUtils.h"
#include "nsReadableUtils.h"
#include "nsNetUtil.h"
#include "nsILineInputStream.h"
#include "nsIObserverService.h"
#include "nsIServiceManager.h"
@@ -209,19 +210,19 @@ nsresult LoadInfo::UpdateSystemLoad()
nsAutoCString buffer;
bool isMore = true;
lineInputStream->ReadLine(buffer, &isMore);
uint64_t user;
uint64_t nice;
uint64_t system;
uint64_t idle;
- if (sscanf(buffer.get(), "cpu %Lu %Lu %Lu %Lu",
- &user, &nice,
- &system, &idle) != 4) {
+ if (PR_sscanf(buffer.get(), "cpu %llu %llu %llu %llu",
+ &user, &nice,
+ &system, &idle) != 4) {
LOG(("Error parsing /proc/stat"));
return NS_ERROR_FAILURE;
}
const uint64_t cpu_times = nice + system + user;
const uint64_t total_times = cpu_times + idle;
UpdateCpuLoad(total_times,