From patchwork Sun Jul 13 05:56:18 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H. Peter Anvin" X-Patchwork-Id: 116203 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E36E43858408 for ; Sun, 13 Jul 2025 05:57:21 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E36E43858408 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=zytor.com header.i=@zytor.com header.a=rsa-sha256 header.s=2025062101 header.b=Cz0Ejvso X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail.zytor.com (terminus.zytor.com [IPv6:2607:7c80:54:3::136]) by sourceware.org (Postfix) with ESMTPS id 81DEB3858C42 for ; Sun, 13 Jul 2025 05:56:32 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 81DEB3858C42 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=zytor.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=zytor.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 81DEB3858C42 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:7c80:54:3::136 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1752386192; cv=none; b=bBR102IjmfXVnTn/VZuIJch1Rz/Nu/u7Sob17HdGx8CKK0HsZAby1xNVKkUnfCjcNR3v2v3+avq1Gz+GmiNlqXAYnxfsvjxlXMOMQjBgJtifzalQy3DuBt9Dl5kpETSQp2P9AUeC+xyIUWEhPaDQ9l9S+5jNH+q73s7MoZH7vNQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1752386192; c=relaxed/simple; bh=K9xndyEGe9p/NFa9s2HQWDEKzniNPpFeS9C3rirhc+A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=RrSCauMQaIklettRHG7YD3B9oybsbpzpF4+3h4hOsi4xEdPujtjd0O3i1lInl+d9e4/NuRoyaNyo8C0CCI17Ygjud8Wm9JS2cBwVw6qMDv1ppHkr1Z2siv2lpt8UwiSI9lK3j6k4fPTXhxBirJsKAy6J/WSqMPsO5R4JnKKAsRk= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81DEB3858C42 Received: from mail.zytor.com ([IPv6:2601:646:8081:9482:5253:b53:6783:9834]) (authenticated bits=0) by mail.zytor.com (8.18.1/8.17.1) with ESMTPSA id 56D5uQu12280932 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 12 Jul 2025 22:56:26 -0700 DKIM-Filter: OpenDKIM Filter v2.11.0 mail.zytor.com 56D5uQu12280932 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zytor.com; s=2025062101; t=1752386187; bh=LrBejGC/xvocEBZre4/lBOmN1CDFhIRN0RbfoeXhsI4=; h=From:To:Cc:Subject:Date:From; b=Cz0EjvsoDtFTwEIGmgsqlrLg7wey7lDPROghhJ99l1k3T7dV5VlswgkgHNKZyJWJt +JXOYxGMXkHQ6K5DOhTgcXZ6YepR2mnpaaCb4ZFBmSZAIpWPn8mhU8elyeSv/OthKI chHACEkMT47n1Sx3IuScgBHh3+oNE7JO4lUiE7p8rTqAgDlugHRDBzZnu7/g857diQ 7F8tIzj1Hg+PFc9tMptkr9qf74GtxRQZlHsYE6neXAnb+vUJeEYZN8Sg+tn7sAt+Hi myWcHM8PBIAC/90IbNcxwO7fypRImlkaEQcJep/QX9bE4CtYaElTpfdjaKi8tQ5Kug iaJaFzto8VOzw== From: "H. Peter Anvin" To: GNU C Library Cc: Florian Weimer , Adhemerval Zanella Netto , Collin Funk , "H. Peter Anvin" Subject: [PATCH 1/1] termios: rename _TERMIOS2_NCCS to KERNEL_TERMIOS2_NCCS Date: Sat, 12 Jul 2025 22:56:18 -0700 Message-ID: <20250713055619.798680-1-hpa@zytor.com> X-Mailer: git-send-email 2.50.1 MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, SPF_HELO_PASS, 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~patchwork=sourceware.org@sourceware.org For consistency with the other built time computed termios2 constants, rename _TERMIOS2_NCCS to KERNEL_TERMIOS2_NCCS. Signed-off-by: H. Peter Anvin (Intel) --- sysdeps/unix/sysv/linux/tcgetattr.c | 2 +- sysdeps/unix/sysv/linux/tcsetattr.c | 2 +- .../unix/sysv/linux/termios-kernel-consts.sym | 2 +- sysdeps/unix/sysv/linux/termios_internals.h | 20 +++++++++---------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/tcgetattr.c b/sysdeps/unix/sysv/linux/tcgetattr.c index 36f68a7868a0..c32becfb7235 100644 --- a/sysdeps/unix/sysv/linux/tcgetattr.c +++ b/sysdeps/unix/sysv/linux/tcgetattr.c @@ -37,7 +37,7 @@ __tcgetattr (int fd, struct termios *termios_p) termios_p->c_ospeed = k_termios.c_ospeed; termios_p->c_ispeed = k_termios.c_ispeed; - copy_c_cc (termios_p->c_cc, NCCS, k_termios.c_cc, _TERMIOS2_NCCS); + copy_c_cc (termios_p->c_cc, NCCS, k_termios.c_cc, KERNEL_TERMIOS2_NCCS); } return retval; diff --git a/sysdeps/unix/sysv/linux/tcsetattr.c b/sysdeps/unix/sysv/linux/tcsetattr.c index ad8f2dfc3f0d..975e57d63f7a 100644 --- a/sysdeps/unix/sysv/linux/tcsetattr.c +++ b/sysdeps/unix/sysv/linux/tcsetattr.c @@ -45,7 +45,7 @@ __tcsetattr (int fd, int optional_actions, const struct termios *termios_p) ___termios2_canonicalize_speeds (&k_termios); - copy_c_cc (k_termios.c_cc, _TERMIOS2_NCCS, termios_p->c_cc, NCCS); + copy_c_cc (k_termios.c_cc, KERNEL_TERMIOS2_NCCS, termios_p->c_cc, NCCS); /* * Choose the proper ioctl number to invoke. diff --git a/sysdeps/unix/sysv/linux/termios-kernel-consts.sym b/sysdeps/unix/sysv/linux/termios-kernel-consts.sym index 3856a8cc1c01..9ad722a0ba65 100644 --- a/sysdeps/unix/sysv/linux/termios-kernel-consts.sym +++ b/sysdeps/unix/sysv/linux/termios-kernel-consts.sym @@ -23,4 +23,4 @@ KERNEL_TCSETSW2 TCSETSW2 KERNEL_TERMIOS2_SIZE sizeof (STRUCT_TERMIOS) KERNEL_TERMIOS2_CC_OFFSET offsetof (STRUCT_TERMIOS, c_cc) KERNEL_TERMIOS2_LINE_OFFSET offsetof (STRUCT_TERMIOS, c_line) -_TERMIOS2_NCCS sizeof ((STRUCT_TERMIOS) { 0 }.c_cc) / sizeof (cc_t) +KERNEL_TERMIOS2_NCCS sizeof ((STRUCT_TERMIOS) { 0 }.c_cc) / sizeof (cc_t) diff --git a/sysdeps/unix/sysv/linux/termios_internals.h b/sysdeps/unix/sysv/linux/termios_internals.h index b2f3f1b3fdff..cd0d1b7fcbc6 100644 --- a/sysdeps/unix/sysv/linux/termios_internals.h +++ b/sysdeps/unix/sysv/linux/termios_internals.h @@ -51,19 +51,19 @@ struct termios2 { - tcflag_t c_iflag; /* input mode flags */ - tcflag_t c_oflag; /* output mode flags */ - tcflag_t c_cflag; /* control mode flags */ - tcflag_t c_lflag; /* local mode flags */ + tcflag_t c_iflag; /* input mode flags */ + tcflag_t c_oflag; /* output mode flags */ + tcflag_t c_cflag; /* control mode flags */ + tcflag_t c_lflag; /* local mode flags */ #if KERNEL_TERMIOS2_CC_OFFSET < KERNEL_TERMIOS2_LINE_OFFSET - cc_t c_cc[_TERMIOS2_NCCS]; /* control characters */ - cc_t c_line; /* line discipline */ + cc_t c_cc[KERNEL_TERMIOS2_NCCS]; /* control characters */ + cc_t c_line; /* line discipline */ #else - cc_t c_line; /* line discipline */ - cc_t c_cc[_TERMIOS2_NCCS]; /* control characters */ + cc_t c_line; /* line discipline */ + cc_t c_cc[KERNEL_TERMIOS2_NCCS]; /* control characters */ #endif - speed_t c_ispeed; /* input speed */ - speed_t c_ospeed; /* output speed */ + speed_t c_ispeed; /* input speed */ + speed_t c_ospeed; /* output speed */ }; /* ---- Application interface definitions ---- */