From 15632504107b40e0c15c1c9efb0f1d19e991a02a Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 10 Jul 2023 22:03:11 +0000 Subject: [PATCH] NetlinkEvent: trivial simplification. free(NULL) is defined as a no-op. Don't overcomplicate things. Bug: http://b/287138549 Test: treehugger Change-Id: I9ae532a71f986d9468f191972a9b7acf6e709d13 --- libsysutils/src/NetlinkEvent.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/libsysutils/src/NetlinkEvent.cpp b/libsysutils/src/NetlinkEvent.cpp index cd9db54fa..55bbe46e1 100644 --- a/libsysutils/src/NetlinkEvent.cpp +++ b/libsysutils/src/NetlinkEvent.cpp @@ -150,15 +150,10 @@ NetlinkEvent::NetlinkEvent() { } NetlinkEvent::~NetlinkEvent() { - int i; - if (mPath) - free(mPath); - if (mSubsystem) - free(mSubsystem); - for (i = 0; i < NL_PARAMS_MAX; i++) { - if (!mParams[i]) - break; - free(mParams[i]); + free(mPath); + free(mSubsystem); + for (auto param : mParams) { + free(param); } }