LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 1e765df6: Merge "Frameworks/base: Wall Werror in core/jni"

Browse Source 
* commit '1e765df61a22f148d796e62cb0ac3dc36297629e':
  Frameworks/base: Wall Werror in core/jni
This commit is contained in:
Andreas Gampe
2014-11-13 23:35:22 +00:00
committed by Android Git Automerger
parent 6fbbd27403 1e765df61a
commit 8281b720cf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/jni/com_android_internal_net_NetworkStatsFactory.cpp
View File

@@ -17,6 +17,7 @@
#define LOG_TAG "NetworkStats" #define LOG_TAG "NetworkStats"
#include <errno.h> #include <errno.h>
#include <inttypes.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@@ -187,7 +188,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
if (endPos - pos == 3) { if (endPos - pos == 3) {
rawTag = 0; rawTag = 0;
} else { } else {
if (sscanf(pos, "%llx", &rawTag) != 1) { if (sscanf(pos, "%" PRIx64, &rawTag) != 1) {
ALOGE("bad tag: %s", pos); ALOGE("bad tag: %s", pos);
fclose(fp); fclose(fp);
return -1; return -1;
@@ -204,7 +205,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
while (*pos == ' ') pos++; while (*pos == ' ') pos++;
// Parse remaining fields. // Parse remaining fields.
if (sscanf(pos, "%u %u %llu %llu %llu %llu", if (sscanf(pos, "%u %u %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64,
&s.uid, &s.set, &s.rxBytes, &s.rxPackets, &s.uid, &s.set, &s.rxBytes, &s.rxPackets,
&s.txBytes, &s.txPackets) == 6) { &s.txBytes, &s.txPackets) == 6) {
if (limitUid != -1 && limitUid != s.uid) { if (limitUid != -1 && limitUid != s.uid) {