drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use sscanf() for parsing tag values." into lmp-dev

Browse Source
This commit is contained in:
Jeff Sharkey
2014-09-09 20:29:34 +00:00
committed by Android (Google) Code Review
parent d5dfb723b8 e47d5435de
commit a237e05cd7
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/jni/com_android_internal_net_NetworkStatsFactory.cpp
View File

@ -175,17 +175,23 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
continue;
}
}
// Skip whitespace.
while (*pos == ' ') {
pos++;
}
// Next field is tag.
rawTag = strtoll(pos, &endPos, 16);
//ALOGI("Index #%d: %s", idx, buffer);
if (pos == endPos) {
ALOGE("bad tag: %s", pos);
fclose(fp);
return -1;
// Ignore whitespace
while (*pos == ' ') pos++;
// Find end of tag field
endPos = pos;
while (*endPos != ' ') endPos++;
// Three digit field is always 0x0, otherwise parse
if (endPos - pos == 3) {
rawTag = 0;
} else {
if (sscanf(pos, "%llx", &rawTag) != 1) {
ALOGE("bad tag: %s", pos);
fclose(fp);
return -1;
}
}
s.tag = rawTag >> 32;
if (limitTag != -1 && s.tag != limitTag) {
@ -193,10 +199,10 @@ static int readNetworkStatsDetail(JNIEnv* env, jclass clazz, jobject stats,
continue;
}
pos = endPos;
// Skip whitespace.
while (*pos == ' ') {
pos++;
}
// Ignore whitespace
while (*pos == ' ') pos++;
// Parse remaining fields.
if (sscanf(pos, "%u %u %llu %llu %llu %llu",
&s.uid, &s.set, &s.rxBytes, &s.rxPackets,