commit e1161a4d7d080366930493afd1f53bd96c29b4ad
author Maciej Żenczykowski <maze@google.com> Thu Apr 23 13:23:26 2020 +0000
committer Maciej Zenczykowski <maze@google.com> Thu Apr 23 13:44:50 2020 +0000
tree 7c784fe8ae21b16a8e7f79223a31cf5e083ffc5b
parent f253caa2f95cc1dfb42acf91049a44db9c0e3771

XfrmController - fix bugprone-sizeof-expression warning

Fixes:
  system/netd/server/XfrmController.cpp:1280:12: warning: suspicious usage of 'sizeof(A*)'; pointer to aggregate [bugprone-sizeof-expression]

Test: builds
Bug: 153035880
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If3d37a22412b1a08e0356b7a36c038a37c946ed7
Merged-In: If3d37a22412b1a08e0356b7a36c038a37c946ed7

server/XfrmController.cpp

diff --git a/server/XfrmController.cpp b/server/XfrmController.cpp
index 6906a1c..33a2aa2 100644
--- a/server/XfrmController.cpp
+++ b/server/XfrmController.cpp
@@ -1261,7 +1261,7 @@
     return sizeof(*usersp);
 }
 
-int XfrmController::fillUserTemplate(const XfrmSpInfo& record, xfrm_user_tmpl* tmpl) {
+void XfrmController::fillUserTemplate(const XfrmSpInfo& record, xfrm_user_tmpl* tmpl) {
     tmpl->id.daddr = record.dstAddr;
     tmpl->id.spi = record.spi;
     tmpl->id.proto = IPPROTO_ESP;
@@ -1277,7 +1277,6 @@
                                         // algos, we should find it and apply it.
                                         // I can't find one.
     tmpl->ealgos = ALGO_MASK_CRYPT_ALL; // TODO: if there's a bitmask somewhere...
-    return sizeof(xfrm_user_tmpl*);
 }
 
 int XfrmController::fillNlAttrUserTemplate(const XfrmSpInfo& record, nlattr_user_tmpl* tmpl) {

server/XfrmController.h

diff --git a/server/XfrmController.h b/server/XfrmController.h
index a38bbeb..587647c 100644
--- a/server/XfrmController.h
+++ b/server/XfrmController.h
@@ -370,7 +370,7 @@
     static netdutils::Status deleteSecurityAssociation(const XfrmCommonInfo& record,
                                                        const XfrmSocket& sock);
     static int fillUserSaId(const XfrmCommonInfo& record, xfrm_usersa_id* said);
-    static int fillUserTemplate(const XfrmSpInfo& record, xfrm_user_tmpl* tmpl);
+    static void fillUserTemplate(const XfrmSpInfo& record, xfrm_user_tmpl* tmpl);
 
     static int fillUserSpInfo(const XfrmSpInfo& record, XfrmDirection direction,
                               xfrm_userpolicy_info* usersp);