From patchwork Fri May 24 17:52:19 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: 1939053 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=PE0JOduA; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; 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 [8.43.85.97]) (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 4VmCLH3yTPz20KL for ; Sat, 25 May 2024 03:52:39 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id CE8733858430 for ; Fri, 24 May 2024 17:52:37 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by sourceware.org (Postfix) with ESMTPS id 8E3EE3858D29 for ; Fri, 24 May 2024 17:52:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E3EE3858D29 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 8E3EE3858D29 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62f ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716573144; cv=none; b=Hjs0AvAgmMwdihTfW/nkQnqfLiJhT+IQZLayjjbKWssEzY04keE5xMAGbGi32HXENMAKbLJYw2RgzCHxirboX0eFIGbHuqKpS9GmYF8qA4Q/vnMHFimT4hI9mTFy4gZLppq/Y+mZzP9wR23Bau3Z4o0xlnKx2HIQh0jN1VFN8F0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1716573144; c=relaxed/simple; bh=5U5sKFaLPcrJ70lWADxnP04e4Z3viSD4E0cZD9RPXMI=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=j3csfsIM1Le15SyNIyxy7pDqLj8yCw92PUWGfrgt+84qjwJ8RJvxQ0rXfqxer2YIbNdgUsOv23rleUgruA9EaOhYYnYSki4a5L0ILIsRtsXENYi1WRU3XnnbgxNAy0xF7nLyKr4Pxim68pLadYJZBdRO1TJLOQxAi4vIkCJzgKE= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1f34b5f1964so15499755ad.2 for ; Fri, 24 May 2024 10:52:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716573141; x=1717177941; 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=58EyPiwnfp/rzFe3bPTjBDT4heG9CteaqEuiquZdl6o=; b=PE0JOduAZWUnwd1mkch2qTibm/4BDKN6lHocltR4fV1XzC+tYACpIKOQIUfVgCiLrm LZpepaBEIq3bEDBWCUxH/A7K2dMrfLpdcMayjgw4Z1npPa1hEJWfaj90oVRNGDa0CEzG 9de0kGvXysWbxUqf5T/RHDGpGmSpVx3NFIUqcoVE0XFceAFAZEGW67ff9Jj79yl3/zcj S7Gm/8rhl9Fh3B6auaPzB04xFs34+4PcrfBNdd/jBWzX+6cE6Ss26XXtUpiftjsy4kVu s2LVkP5aBgsOL1v48gWXFfXQbvBlCXKaUT/wx7n7ij3X3qpjbtZyUyNazMt1WseUhU34 E+tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716573141; x=1717177941; 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=58EyPiwnfp/rzFe3bPTjBDT4heG9CteaqEuiquZdl6o=; b=DkVY1/HyJScIGlEBA56l71q0lPbTvr7Z90AOADoHmS1X7zPjsFINA3X/F3ZoG3sfkS HLdBVRCvvbmj8rV/2awGVW8VlU8X/eU2Z2yl+tfUA1fVoo1fP87UME1wOMHoDs4hurbQ 4GTFCpwbrRIfvnNxVtM9kHlzoA5RkF1u0B2WQpX/esqI5zr4aoHQ1tiuiEdNlIWXvWNy 3R5+0xu1Z7QbEAwVWd5F4BKCIVFJfjvw7/9Kei1wqojIjR57sdXoyipVR31ezezX+H+5 rR05CJTxlnQ0XX31PuLdwmBK01KndbiAe/mKvX1YZFIX9iSXTuZM23uAnySDuqmO+pav LQzg== X-Gm-Message-State: AOJu0Yzg5gJgX0edFuP4Avt8CYH6bcGQQ3pMl5PfvYMNkBH83ogrjvUB GmKApl9sEOmgWbOHN1/v4KUpvKzgMjuBM8q5gs4RynpBuFDDJ6KOdn/Yaw== X-Google-Smtp-Source: AGHT+IGrH/mgfhcvICb0zJykl2ur17G7StoZ4ZTRdzNwwX/vlSF2HqRdD1oId43kYe7KTi8RSFujWw== X-Received: by 2002:a17:902:ea04:b0:1f4:5d87:ffb3 with SMTP id d9443c01a7336-1f45d8807d6mr14755435ad.17.1716573141278; Fri, 24 May 2024 10:52:21 -0700 (PDT) Received: from gnu-cfl-3.localdomain ([172.59.129.178]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f44c75debfsm16691955ad.14.2024.05.24.10.52.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 May 2024 10:52:20 -0700 (PDT) Received: from gnu-cfl-3.. (localhost [IPv6:::1]) by gnu-cfl-3.localdomain (Postfix) with ESMTP id A063A7407BD for ; Fri, 24 May 2024 10:52:19 -0700 (PDT) From: "H.J. Lu" To: libc-alpha@sourceware.org Subject: [PATCH v2] Add scanf/vfscanf/vscanf tests of long double without Date: Fri, 24 May 2024 10:52:19 -0700 Message-ID: <20240524175219.3170191-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, KAM_SHORT, 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 Update test-fscanf.c to add scanf/vfscanf/vscanf tests of long double without including . Signed-off-by: H.J. Lu --- stdio-common/test-fscanf.c | 55 ++++++++++++++++++++++++++++++++-- stdio-common/test-fscanf.input | 3 ++ 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/stdio-common/test-fscanf.c b/stdio-common/test-fscanf.c index f2c4250b51..26477300a5 100644 --- a/stdio-common/test-fscanf.c +++ b/stdio-common/test-fscanf.c @@ -1,4 +1,4 @@ -/* Test fscanf of long double without . +/* Test fscanf/scanf/vfscanf/vscanf of long double without . Copyright (C) 2024 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -16,11 +16,39 @@ License along with the GNU C Library; if not, see . */ +#include #include +#ifndef EXPECTED_LONG_DOUBLE_VALUE +# define EXPECTED_LONG_DOUBLE_VALUE 24.5 +#endif + struct FILE; extern struct FILE *stdin; extern int fscanf (struct FILE *, const char *, ...); +extern int scanf (const char *, ...); +extern int vfscanf (struct FILE *, const char *, va_list); +extern int vscanf (const char *, va_list); + +static int +wrap_vfscanf (struct FILE *fp, const char *format, ...) +{ + va_list ap; + va_start (ap, format); + int ret = vfscanf (fp, format, ap); + va_end (ap); + return ret; +} + +static int +wrap_vscanf (const char *format, ...) +{ + va_list ap; + va_start (ap, format); + int ret = vscanf (format, ap); + va_end (ap); + return ret; +} int main (void) @@ -29,8 +57,31 @@ main (void) long double x; char name[50]; n = fscanf (stdin, "%d%Lf%s", &i, &x, name); + if (n != 3 + || i != 25 + || x != EXPECTED_LONG_DOUBLE_VALUE + || strcmp (name, "thompson")) + return 1; + + n = scanf ("%d%Lf%s", &i, &x, name); + if (n != 3 + || i != 25 + || x != EXPECTED_LONG_DOUBLE_VALUE + || strcmp (name, "thompson")) + return 1; + + n = wrap_vfscanf (stdin, "%d%Lf%s", &i, &x, name); + if (n != 3 + || i != 25 + || x != EXPECTED_LONG_DOUBLE_VALUE + || strcmp (name, "thompson")) + return 1; - if (n != 3 || i != 25 || x != 24.5 || strcmp (name, "thompson")) + n = wrap_vscanf ("%d%Lf%s", &i, &x, name); + if (n != 3 + || i != 25 + || x != EXPECTED_LONG_DOUBLE_VALUE + || strcmp (name, "thompson")) return 1; return 0; diff --git a/stdio-common/test-fscanf.input b/stdio-common/test-fscanf.input index 69322cc51a..20859d314a 100644 --- a/stdio-common/test-fscanf.input +++ b/stdio-common/test-fscanf.input @@ -1 +1,4 @@ 25 24.5 thompson +25 24.5 thompson +25 24.5 thompson +25 24.5 thompson