public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Arjun Shankar <arjun@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc] libio/tst-fopenloc: Use xsetlocale, xfopen, and xfclose Date: Mon, 11 Nov 2019 16:41:00 -0000 [thread overview] Message-ID: <20191111164104.112238.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=f0f0d79ac3a2ed7b4e2b99ff993027172068446e commit f0f0d79ac3a2ed7b4e2b99ff993027172068446e Author: Arjun Shankar <arjun@redhat.com> Date: Mon Nov 11 15:21:55 2019 +0100 libio/tst-fopenloc: Use xsetlocale, xfopen, and xfclose Diff: --- libio/tst-fopenloc.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/libio/tst-fopenloc.c b/libio/tst-fopenloc.c index e9548c5..797540d 100644 --- a/libio/tst-fopenloc.c +++ b/libio/tst-fopenloc.c @@ -25,14 +25,11 @@ #include <string.h> #include <wchar.h> #include <sys/resource.h> +#include <support/support.h> +#include <support/xstdio.h> static const char inputfile[] = "../iconvdata/testdata/ISO-8859-1"; -static int do_test(void); - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" - static int do_bz17916 (void) { @@ -66,14 +63,9 @@ do_test (void) mtrace (); - setlocale (LC_ALL, "de_DE.UTF-8"); + xsetlocale (LC_ALL, "de_DE.UTF-8"); - fp = fopen (inputfile, "r,ccs=ISO-8859-1"); - if (fp == NULL) - { - printf ("cannot open \"%s\": %s\n", inputfile, strerror (errno)); - exit (1); - } + fp = xfopen (inputfile, "r,ccs=ISO-8859-1"); while (! feof_unlocked (fp)) { @@ -85,7 +77,9 @@ do_test (void) fputws (buf, stdout); } - fclose (fp); + xfclose (fp); return do_bz17916 (); } + +#include <support/test-driver.c>
reply other threads:[~2019-11-11 16:41 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191111164104.112238.qmail@sourceware.org \ --to=arjun@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).