diff options
| author | Christopher Ferris <cferris@google.com> | 2014-09-06 16:55:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-09-06 16:55:50 +0000 |
| commit | f4eaaadb8cb0e2ff8d1704827883b5a62173311d (patch) | |
| tree | 247ae6653ffa066017e0214a1a77d5271187702b | |
| parent | 2b653eabb999e2360c0f818242b32b4a141dc795 (diff) | |
| parent | c70b5e66f7095d82465887b951aa7e0b79b4c6a9 (diff) | |
| download | base-f4eaaadb8cb0e2ff8d1704827883b5a62173311d.tar.gz | |
Merge "Fix use of %llx for sscanf 64 bit values."
| -rw-r--r-- | core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index 0b9ad9b39e80..a42b4df2d4b4 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -17,6 +17,7 @@ #define LOG_TAG "NetworkStats" #include <errno.h> +#include <inttypes.h> #include <sys/stat.h> #include <sys/types.h> @@ -79,7 +80,7 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats, while (fgets(buffer, sizeof(buffer), fp) != NULL) { stats_line s; int64_t rawTag; - if (sscanf(buffer, "%d %31s 0x%llx %u %u %llu %llu %llu %llu", &s.idx, + if (sscanf(buffer, "%d %31s 0x%llx %u %u %" SCNu64 " %" SCNu64 " %" SCNu64 " %" SCNu64, &s.idx, s.iface, &rawTag, &s.uid, &s.set, &s.rxBytes, &s.rxPackets, &s.txBytes, &s.txPackets) == 9) { if (s.idx != lastIdx + 1) { |