From patchwork Tue Jun 12 15:46:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Hrubis X-Patchwork-Id: 928396 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.linux.it (client-ip=2001:1418:10:5::2; helo=picard.linux.it; envelope-from=ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.cz Received: from picard.linux.it (picard.linux.it [IPv6:2001:1418:10:5::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 414vQ96yJnz9ryk for ; Wed, 13 Jun 2018 01:46:56 +1000 (AEST) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 06EF41B9950 for ; Tue, 12 Jun 2018 17:46:53 +0200 (CEST) X-Original-To: ltp@lists.linux.it Delivered-To: ltp@picard.linux.it Received: from in-3.smtp.seeweb.it (in-3.smtp.seeweb.it [217.194.8.3]) by picard.linux.it (Postfix) with ESMTP id CF6461B9927 for ; Tue, 12 Jun 2018 17:46:51 +0200 (CEST) Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by in-3.smtp.seeweb.it (Postfix) with ESMTPS id A09DF1A0147C for ; Tue, 12 Jun 2018 17:46:50 +0200 (CEST) Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 4E9DBAF8D for ; Tue, 12 Jun 2018 15:46:50 +0000 (UTC) From: Cyril Hrubis To: ltp@lists.linux.it Date: Tue, 12 Jun 2018 17:46:24 +0200 Message-Id: <20180612154631.435-3-chrubis@suse.cz> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180612154631.435-1-chrubis@suse.cz> References: <20180612154631.435-1-chrubis@suse.cz> X-Virus-Scanned: clamav-milter 0.99.2 at in-3.smtp.seeweb.it X-Virus-Status: Clean X-Spam-Status: No, score=0.2 required=7.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, SPF_PASS autolearn=disabled version=3.4.0 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on in-3.smtp.seeweb.it Subject: [LTP] [RFC PATCH 2/9] tst_safe_sysv_ipc: SAFE_{SHMCTL, MSGCTL} return retval X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: ltp-bounces+incoming=patchwork.ozlabs.org@lists.linux.it Sender: "ltp" These calls do return index into kernel internal array or IPC id for Linux specific cmds, hence we need to propagate the return value. Signed-off-by: Cyril Hrubis Reviewed-by: Petr Vorel --- include/tst_safe_sysv_ipc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/tst_safe_sysv_ipc.h b/include/tst_safe_sysv_ipc.h index e01957f75..4c7500531 100644 --- a/include/tst_safe_sysv_ipc.h +++ b/include/tst_safe_sysv_ipc.h @@ -39,10 +39,10 @@ ssize_t safe_msgrcv(const char *file, const int lineno, int msqid, void *msgp, int safe_msgctl(const char *file, const int lineno, int msqid, int cmd, struct msqid_ds *buf); -#define SAFE_MSGCTL(msqid, cmd, buf) do { \ - safe_msgctl(__FILE__, __LINE__, (msqid), (cmd), (buf)); \ +#define SAFE_MSGCTL(msqid, cmd, buf) ({ \ + int tst_ret_ = safe_msgctl(__FILE__, __LINE__, (msqid), (cmd), (buf)); \ (msqid) = ((cmd) == IPC_RMID ? -1 : (msqid)); \ - } while (0) + tst_ret_;}) int safe_shmget(const char *file, const int lineno, key_t key, size_t size, int shmflg); @@ -59,9 +59,9 @@ int safe_shmdt(const char *file, const int lineno, const void *shmaddr); int safe_shmctl(const char *file, const int lineno, int shmid, int cmd, struct shmid_ds *buf); -#define SAFE_SHMCTL(shmid, cmd, buf) do { \ - safe_shmctl(__FILE__, __LINE__, (shmid), (cmd), (buf)); \ +#define SAFE_SHMCTL(shmid, cmd, buf) ({ \ + int tst_ret_ = safe_shmctl(__FILE__, __LINE__, (shmid), (cmd), (buf)); \ (shmid) = ((cmd) == IPC_RMID ? -1 : (shmid)); \ - } while (0) + tst_ret_;}) #endif /* TST_SAFE_SYSV_IPC_H__ */