Split up prechecks for readability 17/193917/2
authorIgor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Tue, 27 Nov 2018 10:48:30 +0000 (11:48 +0100)
committerIgor Kotrasinski <i.kotrasinsk@partner.samsung.com>
Tue, 27 Nov 2018 11:18:54 +0000 (12:18 +0100)
Change-Id: I19d400d3d8db3915c12b5f9f93bdb767a8c5dc0c
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>
ssflib/src/ssf_storage.cpp

index f96ee1c..e4db78a 100644 (file)
@@ -977,9 +977,11 @@ int init_share_info(po_share_info* share_info) {
 }
 
 int check_share_rule(po_share_info* share_info, uint32_t handleFlags, uint32_t origFlags) {
-       if ((NULL == share_info) || (-1 == init_share_info(share_info))) {
+       if (share_info == NULL)
                return -1;
-       }
+       if (init_share_info(share_info) == -1)
+               return -1;
+
        int ret = 0;
        if(origFlags & TEE_DATA_FLAG_ACCESS_READ && origFlags & TEE_DATA_FLAG_ACCESS_WRITE &&
                origFlags & TEE_DATA_FLAG_SHARE_READ && origFlags & TEE_DATA_FLAG_SHARE_WRITE) {