diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:24:30 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 15:24:30 +0000 |
commit | 1949a12d5da678a8532359a95717d8e63910d93b (patch) | |
tree | 586d52ba1a6c68f69c997131a343c872bedb8d4e /libio/tst-fopenloc.c | |
parent | b12af7e807488f3c955f6eceea75c6f23f39f06d (diff) | |
parent | 963c37d5c0eb62b38f8764b23931c0dcdd497a13 (diff) |
Merge commit 'refs/top-bases/t/master_backports' into t/master_backportst/master_backports
Diffstat (limited to 'libio/tst-fopenloc.c')
-rw-r--r-- | libio/tst-fopenloc.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libio/tst-fopenloc.c b/libio/tst-fopenloc.c index 0f7edb64e9..59f63d27fc 100644 --- a/libio/tst-fopenloc.c +++ b/libio/tst-fopenloc.c @@ -1,5 +1,5 @@ /* Test for ,ccs= handling in fopen. - Copyright (C) 2001-2016 Free Software Foundation, Inc. + Copyright (C) 2001-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 2001. @@ -26,9 +26,13 @@ #include <wchar.h> #include <sys/resource.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) { @@ -39,7 +43,7 @@ do_bz17916 (void) setrlimit (RLIMIT_STACK, &rl); const size_t sz = 2 * 1024 * 1024; - char *ccs = malloc (sz); + char *ccs = xmalloc (sz); strcpy (ccs, "r,ccs="); memset (ccs + 6, 'A', sz - 6 - 1); ccs[sz - 1] = '\0'; @@ -85,6 +89,3 @@ do_test (void) return do_bz17916 (); } - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" |