From nobody Fri Nov 7 12:04:30 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1547847251659130.62582700849225; Fri, 18 Jan 2019 13:34:11 -0800 (PST) Received: from localhost ([127.0.0.1]:47397 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbm7-00061X-UC for importer@patchew.org; Fri, 18 Jan 2019 16:34:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gkbju-0004hX-Bo for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gkbjt-0003xB-ET for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:46 -0500 Received: from mail-pf1-x442.google.com ([2607:f8b0:4864:20::442]:39395) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gkbjt-0003ow-5t for qemu-devel@nongnu.org; Fri, 18 Jan 2019 16:31:45 -0500 Received: by mail-pf1-x442.google.com with SMTP id r136so7200758pfc.6 for ; Fri, 18 Jan 2019 13:31:40 -0800 (PST) Received: from cloudburst.twiddle.net ([2001:8000:10e0:a000:c673:a6b6:fdef:1933]) by smtp.gmail.com with ESMTPSA id v12sm5833667pgg.41.2019.01.18.13.31.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 18 Jan 2019 13:31:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uYCCSjdXn0Q17nLwgrskP9sJiH9L/F6XImgNprliAmk=; b=dtesyX1vmoJi+pbJBljf39RXZ+3CqrqCR3ti2Q9jWYTKSjNmkCe03koIIyUd5iPvtd TAmiAwW5rMoXTffPMkUih2mBmcqKqK45CHV3x+NgJe1umyoetzvhaT5XeUgjpDiNnmxU fv4N/lgRKe6dW2xyKkk68EHIGS+gdMo4hdP2w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=uYCCSjdXn0Q17nLwgrskP9sJiH9L/F6XImgNprliAmk=; b=BYk6+QKpfmovysETUWWYnJNA+quIUsoFSy4xOcvUU3emcOV8TaQwD+e+hAKYFC0TwG SX7F3Prt+Y3Q/Z4ZJRVk7+b9f7W3hyrD604s4Xuhn2LJT++nIFW/Vm3y4qyrPh1chtcX +M9rn62hP4kuHSQjaXpEG/Bsf4iclNrxRlKJfONqzRyMO5rqAO3b/KTc15D1YWWKfYoy Ry615m78TmMhpZylA7iuYAvcnE5XSHEdXpv5TQQoPuj05MGqJ1SQr2D4v4lBepl4+5z4 g1WVv/owrNtDYjQoO5V01icFYAcy4QI93/VggfcMD5bx1rOJowifCCAOHnps00mjPNNG qqTw== X-Gm-Message-State: AJcUukcMfHsvnRTCdX+U2P2GZTtuhziLudTmlEC7vmFfIOW0kzILYCCZ OQS+fadYowCfIep046djxL4Wu1Z75Tw= X-Google-Smtp-Source: ALg8bN5tN286sfXs/cNoN1XeVVbSCkZpMjk4U+iMedan3otU0Z4edIFfdfitqODJuOOtm6LOQjZxKg== X-Received: by 2002:a62:2044:: with SMTP id g65mr20839729pfg.127.1547847099238; Fri, 18 Jan 2019 13:31:39 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 19 Jan 2019 08:30:38 +1100 Message-Id: <20190118213122.22865-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190118213122.22865-1-richard.henderson@linaro.org> References: <20190118213122.22865-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::442 Subject: [Qemu-devel] [PATCH v6 05/49] linux-user: Tidy do_openat loop over fakes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: laurent@vivier.eu Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Cleaner to use ARRAY_SIZE to loop over elements instead of using a sentinel within the data structure. Signed-off-by: Richard Henderson --- linux-user/syscall-file.inc.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/linux-user/syscall-file.inc.c b/linux-user/syscall-file.inc.c index ffa70bbea8..f202a4c8f4 100644 --- a/linux-user/syscall-file.inc.c +++ b/linux-user/syscall-file.inc.c @@ -229,7 +229,6 @@ static abi_long do_openat(void *cpu_env, int dirfd, abi= _ulong target_path, int (*fill)(void *cpu_env, int fd); int (*cmp)(const char *s1, const char *s2); }; - const struct fake_open *fake_open; static const struct fake_open fakes[] =3D { { "maps", open_self_maps, is_proc_myself }, { "stat", open_self_stat, is_proc_myself }, @@ -238,12 +237,12 @@ static abi_long do_openat(void *cpu_env, int dirfd, a= bi_ulong target_path, #if defined(HOST_WORDS_BIGENDIAN) !=3D defined(TARGET_WORDS_BIGENDIAN) { "/proc/net/route", open_net_route, is_proc }, #endif - { NULL, NULL, NULL } }; =20 char *pathname =3D lock_user_string(target_path); int flags =3D target_to_host_bitmask(target_flags, fcntl_flags_tbl); abi_long ret; + size_t i; =20 if (!pathname) { return -TARGET_EFAULT; @@ -257,17 +256,16 @@ static abi_long do_openat(void *cpu_env, int dirfd, a= bi_ulong target_path, goto done; } =20 - for (fake_open =3D fakes; fake_open->filename; fake_open++) { - if (fake_open->cmp(pathname, fake_open->filename)) { - break; - } - } - - if (fake_open->filename) { + for (i =3D 0; i < ARRAY_SIZE(fakes); ++i) { + const struct fake_open *fake_open =3D &fakes[i]; const char *tmpdir; char filename[PATH_MAX]; int fd; =20 + if (!fake_open->cmp(pathname, fake_open->filename)) { + continue; + } + /* create temporary file to map stat to */ tmpdir =3D getenv("TMPDIR"); if (!tmpdir) { --=20 2.17.2