From nobody Tue Feb 10 15:45:05 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=1610530923; cv=none; d=zohomail.com; s=zohoarc; b=NOhkjfm3EcTQHG82wcSeozIfZoGt/spZM0knKwXM/WWJJJb3QZD2PIuRU+ZnxZLkWlEp+TxNndjbv/sgVFswt2PRyE40UOaQx9wcxezAQsVLA/N/9lhXmJ3JTWyMfFyNpbYzcbUwIrQQUI37DUGBrPdZ70ZrG6dH1JLBKxaZ/WA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1610530923; 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=fRz13he5Kc1nzl04VHNaQ5fK7vXp1calCEmRUjAo45k=; b=nrOctJbvkDNKDET9b2TUfKbtre55GZV7EyhCrOu2Cn+6x57sUkFuTm84DBkYjHs5W+ztvz7xUKaK61ohzLGyMcUqUDnVanpbUlyrYBHwkbE6SLJkKY103H6YcHiybWf/d1Rlj+K8fILts3UtQU2MwBCN/MNVn+MfcDJNvq1Sx0o= 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 1610530923756435.2360400139288; Wed, 13 Jan 2021 01:42:03 -0800 (PST) Received: from localhost ([::1]:48972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kzcfC-000129-J1 for importer@patchew.org; Wed, 13 Jan 2021 04:42:02 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58596) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzcVm-0007NL-0z for qemu-devel@nongnu.org; Wed, 13 Jan 2021 04:32:18 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3026) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kzcVj-0003NW-Tl for qemu-devel@nongnu.org; Wed, 13 Jan 2021 04:32:17 -0500 Received: from DGGEMS411-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4DG2Hx61Kgzj69W; Wed, 13 Jan 2021 17:31:09 +0800 (CST) Received: from [10.108.235.13] (10.108.235.13) by DGGEMS411-HUB.china.huawei.com (10.3.19.211) with Microsoft SMTP Server id 14.3.498.0; Wed, 13 Jan 2021 17:32:03 +0800 Subject: [PATCH V3 2/4] bsd-user: suspect code indent for conditional statements References: To: , From: shiliyang Message-ID: Date: Wed, 13 Jan 2021 17:32:03 +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.191; envelope-from=shiliyang@huawei.com; helo=szxga05-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_H2=-0.001, 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 Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch fixes error style problems found by checkpatch.pl: ERROR: suspect code indent for conditional statements Signed-off-by: Liyang Shi --- bsd-user/elfload.c | 10 +++++----- bsd-user/syscall.c | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bsd-user/elfload.c b/bsd-user/elfload.c index 35c340f13a..a121e71339 100644 --- a/bsd-user/elfload.c +++ b/bsd-user/elfload.c @@ -184,7 +184,7 @@ static inline void init_thread(struct target_pt_regs *r= egs, struct image_info *i memset(regs, 0, sizeof(*regs)); regs->ARM_cpsr =3D 0x10; if (infop->entry & 1) - regs->ARM_cpsr |=3D CPSR_T; + regs->ARM_cpsr |=3D CPSR_T; regs->ARM_pc =3D infop->entry & 0xfffffffe; regs->ARM_sp =3D infop->start_stack; /* FIXME - what to for failure of get_user()? */ @@ -784,7 +784,7 @@ static abi_ulong create_elf_tables(abi_ulong p, int arg= c, int envc, sp =3D sp &~ (abi_ulong)15; size =3D (DLINFO_ITEMS + 1) * 2; if (k_platform) - size +=3D 2; + size +=3D 2; #ifdef DLINFO_ARCH_ITEMS size +=3D DLINFO_ARCH_ITEMS * 2; #endif @@ -871,7 +871,7 @@ static abi_ulong load_elf_interp(struct elfhdr *interp_= elf_ex, malloc(sizeof(struct elf_phdr) * interp_elf_ex->e_phnum); if (!elf_phdata) - return ~((abi_ulong)0UL); + return ~((abi_ulong)0UL); /* * If the size of this structure has changed, then punt, since @@ -1267,7 +1267,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct= target_pt_regs *regs, if (strcmp(elf_interpreter,"/usr/lib/libc.so.1") =3D=3D 0 || strcmp(elf_interpreter,"/usr/lib/ld.so.1") =3D=3D 0) { - ibcs2_interpreter =3D 1; + ibcs2_interpreter =3D 1; } #if 0 @@ -1314,7 +1314,7 @@ int load_elf_binary(struct linux_binprm *bprm, struct= target_pt_regs *regs, /* Now figure out which format our binary is */ if ((N_MAGIC(interp_ex) !=3D OMAGIC) && (N_MAGIC(interp_ex) !=3D Z= MAGIC) && (N_MAGIC(interp_ex) !=3D QMAGIC)) { - interpreter_type =3D INTERPRETER_ELF; + interpreter_type =3D INTERPRETER_ELF; } if (interp_elf_ex.e_ident[0] !=3D 0x7f || diff --git a/bsd-user/syscall.c b/bsd-user/syscall.c index d38ec7a162..9b471b665c 100644 --- a/bsd-user/syscall.c +++ b/bsd-user/syscall.c @@ -241,7 +241,7 @@ static abi_long do_freebsd_sysctl(abi_ulong namep, int3= 2_t namelen, abi_ulong ol return -TARGET_EFAULT; holdlen =3D oldlen; for (p =3D hnamep, q =3D snamep, i =3D 0; i < namelen; p++, i++) - *q++ =3D tswap32(*p); + *q++ =3D tswap32(*p); oidfmt(snamep, namelen, NULL, &kind); /* XXX swap hnewp */ ret =3D get_errno(sysctl(snamep, namelen, holdp, &holdlen, hnewp, newl= en)); --=20 2.29.1.59.gf9b6481aed