From nobody Mon Feb 9 02:48:18 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1610936582; cv=none; d=zohomail.com; s=zohoarc; b=ckde0MYNDdy41LB6wgkRLuNsxvT37c3iRWqr2Sn0WWX4o87pfsYXtvqGAOSGKgQDW9Hm/zZ2/V5tijP11oUWd2vAQR9Rav0mD0JQyAVkbhG4I9WHCfmxbdgdmxxWahbHWOweFFI2aUf2a7OOk6P2jN2RZSxPuInFbAHKxDMrHbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610936582; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DRdv5JPuZIp8cyVTrpxMbkYRhkbwHomNjweFVqrjwYw=; b=TNXCb+qakEltildtyy/tNkjymnZL852GNctdS3huhaO6wC+fPiRYH6p+dFGBgGdwlUgjOALdTx4ZAYhtULgxxkIDeytlb47fSCFxWlBJEFUkq6pF73rx/1zDjqSB/aTQGfiUN5W8Z+uyhYAfLK4mvrxbB3vispblV3bq81lRe/M= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1610936582728407.11891784359375; Sun, 17 Jan 2021 18:23:02 -0800 (PST) Received: from localhost ([::1]:49934 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1KC5-0004tN-O6 for importer@patchew.org; Sun, 17 Jan 2021 21:23:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42340) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1K8v-0002V6-W6 for qemu-devel@nongnu.org; Sun, 17 Jan 2021 21:19:46 -0500 Received: from szxga07-in.huawei.com ([45.249.212.35]:2640) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1K8t-0003Dt-J4 for qemu-devel@nongnu.org; Sun, 17 Jan 2021 21:19:45 -0500 Received: from DGGEMS407-HUB.china.huawei.com (unknown [172.30.72.59]) by szxga07-in.huawei.com (SkyGuard) with ESMTP id 4DJwST6rHpz7WZp; Mon, 18 Jan 2021 10:18:33 +0800 (CST) Received: from [10.108.235.13] (10.108.235.13) by DGGEMS407-HUB.china.huawei.com (10.3.19.207) with Microsoft SMTP Server id 14.3.498.0; Mon, 18 Jan 2021 10:19:31 +0800 Subject: [PATCH V4 1/4] bsd-user: "foo * bar" should be "foo *bar" References: To: Warner Losh , Peter Maydell From: shiliyang Message-ID: <02263a65-7e3a-2d09-d7b1-6d54a19c8454@huawei.com> Date: Mon, 18 Jan 2021 10:19:31 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.4.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.108.235.13] X-CFilter-Loop: Reflected Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=45.249.212.35; envelope-from=shiliyang@huawei.com; helo=szxga07-in.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.chen@huawei.com, hunongda@huawei.com, QEMU Developers Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch fixes error style problems found by checkpatch.pl: ERROR: "foo ** bar" should be "foo **bar". ERROR: "foo * bar" should be "foo *bar" Signed-off-by: Liyang Shi --- bsd-user/bsdload.c | 4 ++-- bsd-user/elfload.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bsd-user/bsdload.c b/bsd-user/bsdload.c index d708a54b03..65a2346bc7 100644 --- a/bsd-user/bsdload.c +++ b/bsd-user/bsdload.c @@ -36,7 +36,7 @@ abi_long memcpy_to_target(abi_ulong dest, const void *src, return 0; } -static int count(char ** vec) +static int count(char **vec) { int i; @@ -188,7 +188,7 @@ static int find_in_path(char *path, const char *filenam= e, char *retpath, return found; } -int loader_exec(const char * filename, char ** argv, char ** envp, +int loader_exec(const char *filename, char **argv, char **envp, struct target_pt_regs *regs, struct image_info *infop, struct bsd_binprm *bprm) { diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 373292e468..4d1a572534 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -66,12 +66,12 @@ static int load_elf_sections(const struct elfhdr *hdr, = struct elf_phdr *phdr, abi_ulong target_stksiz; abi_ulong target_stkbas; -static inline void memcpy_fromfs(void * to, const void * from, unsigned lo= ng n) +static inline void memcpy_fromfs(void *to, const void *from, unsigned long= n) { memcpy(to, from, n); } -static int load_aout_interp(void * exptr, int interp_fd); +static int load_aout_interp(void *exptr, int interp_fd); #ifdef BSWAP_NEEDED static void bswap_ehdr(struct elfhdr *ehdr) @@ -156,7 +156,7 @@ static void bswap_note(struct elf_note *en) { } * to be put directly into the top of new user memory. * */ -static abi_ulong copy_elf_strings(int argc,char ** argv, void **page, +static abi_ulong copy_elf_strings(int argc, char **argv, void **page, abi_ulong p) { char *tmp, *tmp1, *pag =3D NULL; @@ -288,7 +288,7 @@ static void padzero(abi_ulong elf_bss, abi_ulong last_b= ss) } } -static abi_ulong load_elf_interp(struct elfhdr * interp_elf_ex, +static abi_ulong load_elf_interp(struct elfhdr *interp_elf_ex, int interpreter_fd, abi_ulong *interp_load_addr) { struct elf_phdr *elf_phdata =3D NULL; @@ -614,11 +614,11 @@ int load_elf_binary(struct bsd_binprm *bprm, struct t= arget_pt_regs *regs, unsigned int interpreter_type =3D INTERPRETER_NONE; unsigned char ibcs2_interpreter; int i; - struct elf_phdr * elf_ppnt; + struct elf_phdr *elf_ppnt; struct elf_phdr *elf_phdata; abi_ulong elf_bss, elf_brk; int error, retval; - char * elf_interpreter; + char *elf_interpreter; abi_ulong baddr, elf_entry, et_dyn_addr, interp_load_addr =3D 0; abi_ulong reloc_func_desc =3D 0; char passed_fileno[6]; @@ -785,7 +785,7 @@ int load_elf_binary(struct bsd_binprm *bprm, struct tar= get_pt_regs *regs, and then start this sucker up */ { - char * passed_p; + char *passed_p; if (interpreter_type =3D=3D INTERPRETER_AOUT) { snprintf(passed_fileno, sizeof(passed_fileno), "%d", bprm->fd); @@ -2254,7 +2254,7 @@ out: #endif /* USE_ELF_CORE_DUMP */ -static int load_aout_interp(void * exptr, int interp_fd) +static int load_aout_interp(void *exptr, int interp_fd) { printf("a.out interpreter not yet supported\n"); --=20 2.29.1.59.gf9b6481aed