From 4421b2b9c299a593ec3a88a4812d4ae19d093dd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maciej=20=C5=BBenczykowski?= Date: Mon, 30 Dec 2019 07:54:22 -0800 Subject: [PATCH] convert 'Stats stats; memset(&stats, 0, sizeof(Stats));' to 'Stats stats = {};' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Not only is it more concise, but it's also just a tad more correct: since it really should have been 'sizeof(stats)' not 'sizeof(Stats)'. Test: builds, atest Bug: 146787904 Signed-off-by: Maciej Żenczykowski Change-Id: I6cf0295878c7b34cedfe3ae44ff7410ef419f8b9 --- .../jni/com_android_server_net_NetworkStatsService.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/services/core/jni/com_android_server_net_NetworkStatsService.cpp b/services/core/jni/com_android_server_net_NetworkStatsService.cpp index 740c618317..4696dd0bb8 100644 --- a/services/core/jni/com_android_server_net_NetworkStatsService.cpp +++ b/services/core/jni/com_android_server_net_NetworkStatsService.cpp @@ -150,8 +150,7 @@ static int parseUidStats(const uint32_t uid, Stats* stats) { } static jlong getTotalStat(JNIEnv* env, jclass clazz, jint type, jboolean useBpfStats) { - Stats stats; - memset(&stats, 0, sizeof(Stats)); + Stats stats = {}; if (useBpfStats) { if (bpfGetIfaceStats(NULL, &stats) == 0) { @@ -175,8 +174,7 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type, return UNKNOWN; } - Stats stats; - memset(&stats, 0, sizeof(Stats)); + Stats stats = {}; if (useBpfStats) { if (bpfGetIfaceStats(iface8.c_str(), &stats) == 0) { @@ -194,8 +192,7 @@ static jlong getIfaceStat(JNIEnv* env, jclass clazz, jstring iface, jint type, } static jlong getUidStat(JNIEnv* env, jclass clazz, jint uid, jint type, jboolean useBpfStats) { - Stats stats; - memset(&stats, 0, sizeof(Stats)); + Stats stats = {}; if (useBpfStats) { if (bpfGetUidStats(uid, &stats) == 0) {