From patchwork Fri Jul 7 14:59:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 117183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp3340808vqx; Fri, 7 Jul 2023 08:15:02 -0700 (PDT) X-Google-Smtp-Source: APBJJlE82xRZweLM3pLi/DKREtzY04N1JjGN1V7cWlacdI0At4LMlyfmDocFWn4O5cNTk8P980ms X-Received: by 2002:a17:906:300b:b0:98e:1deb:cb03 with SMTP id 11-20020a170906300b00b0098e1debcb03mr3924345ejz.56.1688742902324; Fri, 07 Jul 2023 08:15:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688742902; cv=none; d=google.com; s=arc-20160816; b=G9/ieg+CY0rO8vuKWuwT8YDkujuAWS9sG5/UI3nvJyN5v6aK7FHyZ83Z2ocgbtT9zU hhRuaT4/TcG+Mg7QADHkA73QpQlyPQlzvY34/eeHFWa8TFXxZz263DTGkq7hCc1kY3nb SB0uXnhCPkr2/4tragc4/AilHdU5gxUIptVVLrItnIoSmF2fdQRX+lVZqVka9mgH1wIQ VeYFS6EYQKGXROBsu8cKtIVO6Yg9BBWKk9mPqXdd87ERcIN14Wm04qpOb2pFB3VipdlV Z20VbtNiZ0YIktK0VLNhSABnaGCSTAkgHgRnSaAtjX0fFVsnZbh5wV5yfYx1x3YoSirw 0Y1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:feedback-id:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=04cfvk+LFwaY7G6Nn0MuAE7yeF6PpM5F7Wy+YBQB4bc=; fh=pYBoK8NKvGZirLsyIjvjlYHPy/fM5+u4iD3mF5vegBA=; b=m7p1/1t5tPEsdhNXsvtvOZ/TXgNq4vEv303BYR2y+hc/5jJXlE0ulwfkN8mLQ7nRqK tJn1q0jhFsysMgWVrzk7+bpEMjXciA9voE0G2oGj/bESNemt/ppG4VVeqJwnL0zwMk/1 g5yBRKd8V3Vn9lA6pgb9vPZuAByl8JTBkBRh/qiZsMoVvTMkVNZXyBRByIAKYajuAm37 pFr1BOEpux8G5d/8L5uvopll9VLbRlcjKLfXRPMe7xBCaJBDEB59IMdskGvHSTBWxxVx /GJL8hEChKU3mcpfCFbXanlv0moKCxuUqXHptNWDV+AFPcnyViRmtLLFBbUxdKoHYE3w 58PA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb26-20020a170906b89a00b009659573b4e3si2519153ejb.51.2023.07.07.08.14.38; Fri, 07 Jul 2023 08:15:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233147AbjGGPA1 (ORCPT + 99 others); Fri, 7 Jul 2023 11:00:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232308AbjGGPA0 (ORCPT ); Fri, 7 Jul 2023 11:00:26 -0400 Received: from bg4.exmail.qq.com (bg4.exmail.qq.com [43.155.65.254]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F241A1FE2; Fri, 7 Jul 2023 08:00:21 -0700 (PDT) X-QQ-mid: bizesmtp66t1688742007tg949pqx Received: from linux-lab-host.localdomain ( [116.30.131.119]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 07 Jul 2023 23:00:06 +0800 (CST) X-QQ-SSF: 01200000000000D0W000000A0000000 X-QQ-FEAT: F7g8sXqc8jKUXva1LOQuC3l6Huh4naBPWG4uwtnPE08/V+nzmxJAVIlC+NW4t GJBwcqaJMlH3AHBqAX6F0hXsEzGUuQj2+Q74Sxs9xvMGzhsPQ8eXADWbmJu7pt7Lky2X+Dn rwIOhzzB6DGVdZwiOfFl5lZJ08gjw668dZcOO+UMASsBHylhSt++/1YjHCR3vYaC3Dn2Tzb KDzd/Nd7hf6waMdwYz/zlrhe8E0wZckFp/hFTCcxBjqi0gereXhOL1hY0gYQCPPqH03bkBG Q2laSXI34883bzQwno94VwwwNoAaTo+M3fnMzBk7X4MVaLuXhsDJRMxTxE7tfjoMeI169XX 608IzYYMbWNlzFPOQYTjr4y2sxvNcIizzGf64Ldy+qNDqeSumMrewESt2diJw== X-QQ-GoodBg: 0 X-BIZMAIL-ID: 1688201172120877824 From: Zhangjin Wu To: w@1wt.eu Cc: falcon@tinylab.org, arnd@arndb.de, david.laight@aculab.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-riscv@lists.infradead.org, thomas@t-8ch.de Subject: [PATCH v6 08/15] tools/nolibc: clean up sbrk() routine Date: Fri, 7 Jul 2023 22:59:53 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:tinylab.org:qybglogicsvrgz:qybglogicsvrgz5a-1 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1770775277998028898?= X-GMAIL-MSGID: =?utf-8?q?1770775277998028898?= Fix up the error reported by scripts/checkpatch.pl: ERROR: do not use assignment in if condition #95: FILE: tools/include/nolibc/sys.h:95: + if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc)) Apply the new generic __sysret() to merge the SET_ERRNO() and return lines. Signed-off-by: Zhangjin Wu --- tools/include/nolibc/sys.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 3d01a24e6f7a..61a3204b00d7 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -89,14 +89,13 @@ int brk(void *addr) static __attribute__((unused)) void *sbrk(intptr_t inc) { - void *ret; - /* first call to find current end */ - if ((ret = sys_brk(0)) && (sys_brk(ret + inc) == ret + inc)) + void *ret = sys_brk(0); + + if (ret && sys_brk(ret + inc) == ret + inc) return ret + inc; - SET_ERRNO(ENOMEM); - return (void *)-1; + return (void *)__sysret(-ENOMEM); }