From patchwork Mon May 20 01:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1936871 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=aVYCXePm; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VjL5w65cJz20KG for ; Mon, 20 May 2024 11:47:00 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7FCEE3858D38 for ; Mon, 20 May 2024 01:46:57 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id AEA423858D1E for ; Mon, 20 May 2024 01:46:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AEA423858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org AEA423858D1E Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716169602; cv=none; b=Va39+x52Fj9cpB7kBJEA1hbmpKUJyF1usElC5xzPg0wriR/lfXzaK2dTrQEQG9BDYuoztjNZPJHImVIwUuPZ4poG513HAYvoWCBn+BKTZmJ0PE0gd/G/Y0HpGylAOFlDXs3h5eG6J2bKErnQWiSBrxLN5oKJfA1k3kMNyef8NSY= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716169602; c=relaxed/simple; bh=G9SCm8pYrkBKR3eLs5ZBO5Z308D8T6Qgypj9HWQYt1o=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=AvPq9LAA+etHneFRwPZwEoODyUp7EmmqN2syKul6f8wZofXNRRi4Mwjjl4XvBonUbe19VN1r+tpUwqy/axHdQh3dR6LB5REMv84X3frSB9bzsMlUzdUx7IUjZxAvGIDy1WkFzecVNK+DxqmnUnsVjMedobwEiC0DJr4pY1IYpbc= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e3c3aa8938so60748515ad.1 for ; Sun, 19 May 2024 18:46:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716169598; x=1716774398; darn=sourceware.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=UDiYPnzKVKU/TyPbmcXkSdwaAEoREzsut1d7vYTXBtY=; b=aVYCXePmciWQZ802aeXcy491u+USltw7JeMw4XplINT/f8YQ+eAS18z1JHvBKBPTUw JJsopAtEon6+iJ06kVt3B9YHpBee16w9cN5riTmtz3iBiRlExURoCmbdc+mWeNxlaMxk yNzISVwH17WpStqeTAIVon2anfh/IOpKyqR8jpz+sgFpRWe5gzhyz+8jRHTmWER82OsP CLaStnaiZkVn6VOdE65KtAlfO3jpWG+IjW7KFY0wJIUkMcRra4XobbgyhZuLcCA1Ga8e 3yRrozQKMRZTgUk4smI3BVQuQj0TlRy0sDbTlb0bYKK0Cuz6KGQ0wH+iFEvtYTT3rI+f Q+uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716169598; x=1716774398; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UDiYPnzKVKU/TyPbmcXkSdwaAEoREzsut1d7vYTXBtY=; b=nD/i2ef3U6v21LnmLxmb3YNh+IJfOJbMBfnirvH3xO+dgGNYaVvbWNt+n7/HfmSAaR Apdz95GfT5IBuXstkAiU5uY+CZD8ALOa0iHNMhvIqvO+rOkYivI4ZdVVeyTjeXs7l9wa PRl0EYM2ilpZeXCEaNV9VNKSv0R/dGvNcDJmYd/LI9NPquo/zgYkY04FFsfC9SCxBayP 0vTfd9iZM32DpmGG+Cc+kDG2VZpqYknZUqAIAy1ayqAQF8ekVo6Kc1piz1Lgg5LGt3DQ kHRKHKidvTZHVOinMRpgIRZFxBRjRQQyTKxoAzs4SeIl+QLV1JidmUdp5eMsbYTxwsfv wnoA== X-Gm-Message-State: AOJu0YxvVIqGYUbumUUfHzku7NUkxLuzR6Eg650xjom/L+Wpdj0QRS/A 03l8OmWt+nIwmDRqjaiSeglbSUTH12x2qU6pISENE5YxknHLp9zDYoBxog== X-Google-Smtp-Source: AGHT+IGUtBI+d75tZLLX0yk8P9dQS2Ns5O1t41hKlqP8fDysTJ1r9ZoGZqIAUQ0Loc0KHn/D3TPSZw== X-Received: by 2002:a17:903:22cb:b0:1f2:fa51:6ee5 with SMTP id d9443c01a7336-1f2fa51738bmr27257285ad.6.1716169598424; Sun, 19 May 2024 18:46:38 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.56.168.158]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0bad5f30sm192095415ad.64.2024.05.19.18.46.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 May 2024 18:46:38 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id 8ABEF74045C for ; Sun, 19 May 2024 18:46:36 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH] Rename procutils_read_file to __libc_procutils_read_file [BZ #31755] Date: Sun, 19 May 2024 18:46:36 -0700 Message-ID: <20240520014636.3219476-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.45.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3022.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Fix BZ #31755 by renaming the internal function procutils_read_file to __libc_procutils_read_file. Signed-off-by: H.J. Lu Reviewed-by: Adhemerval Zanella --- sysdeps/unix/sysv/linux/pidfd_getpid.c | 2 +- sysdeps/unix/sysv/linux/procutils.c | 5 +++-- sysdeps/unix/sysv/linux/procutils.h | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sysdeps/unix/sysv/linux/pidfd_getpid.c b/sysdeps/unix/sysv/linux/pidfd_getpid.c index 8567b413dd..ebcbe8fdf6 100644 --- a/sysdeps/unix/sysv/linux/pidfd_getpid.c +++ b/sysdeps/unix/sysv/linux/pidfd_getpid.c @@ -105,7 +105,7 @@ pidfd_getpid (int fd) *_fitoa_word (fd, p, 10, 0) = '\0'; struct parse_fdinfo_t fdinfo = { .found = false, .pid = -1 }; - if (!procutils_read_file (fdinfoname, parse_fdinfo, &fdinfo)) + if (!__libc_procutils_read_file (fdinfoname, parse_fdinfo, &fdinfo)) /* The fdinfo contains an invalid 'Pid:' value. */ return INLINE_SYSCALL_ERROR_RETURN_VALUE (EBADF); diff --git a/sysdeps/unix/sysv/linux/procutils.c b/sysdeps/unix/sysv/linux/procutils.c index 25666ec0cb..86d3d37329 100644 --- a/sysdeps/unix/sysv/linux/procutils.c +++ b/sysdeps/unix/sysv/linux/procutils.c @@ -71,8 +71,9 @@ next_line (char **r, int fd, char *const buffer, char **cp, char **re, } bool -procutils_read_file (const char *filename, procutils_closure_t closure, - void *arg) +__libc_procutils_read_file (const char *filename, + procutils_closure_t closure, + void *arg) { enum { buffer_size = PROCUTILS_MAX_LINE_LEN }; char buffer[buffer_size]; diff --git a/sysdeps/unix/sysv/linux/procutils.h b/sysdeps/unix/sysv/linux/procutils.h index 73ef3e5f5b..acf1ec587a 100644 --- a/sysdeps/unix/sysv/linux/procutils.h +++ b/sysdeps/unix/sysv/linux/procutils.h @@ -37,7 +37,8 @@ typedef int (*procutils_closure_t) (const char *line, void *arg); It returns true in case the file is fully read or false if CLOSURE returns a value diferent than 0. */ -bool procutils_read_file (const char *filename, procutils_closure_t closure, - void *arg) attribute_hidden; +bool __libc_procutils_read_file (const char *filename, + procutils_closure_t closure, + void *arg) attribute_hidden; #endif