From fa5e27458a60ac4e878dd0e5c1a0267cf7bc9a06 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 11 Oct 2015 11:02:54 +0200 Subject: [PATCH] Removed surplus test which was always true. Coverity CID 12539. --- libisofs/node.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libisofs/node.c b/libisofs/node.c index 5d6d33e..f377454 100644 --- a/libisofs/node.c +++ b/libisofs/node.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2007 Vreixo Formoso - * Copyright (c) 2009 - 2014 Thomas Schmitt + * Copyright (c) 2009 - 2015 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -2241,10 +2241,8 @@ int iso_node_set_acl_text(IsoNode *node, char *access_text, char *default_text, ret = ISO_AAIP_BAD_ACL_TEXT; goto ex; } - ret = 1; - if (a_text != NULL || d_text != NULL) - ret = aaip_encode_both_acl(a_text, d_text, st_mode, - &acl_len, &acl, 2 | 8); + ret = aaip_encode_both_acl(a_text, d_text, st_mode, + &acl_len, &acl, 2 | 8); } else { ret = 1; if (access_text != NULL || default_text != NULL)