From 5fefb43629b36b143c9ac100b89408a2cbeed3a8 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Mon, 21 May 2012 20:41:36 +0200 Subject: [BZ #13691], Revert breakage of iconv() converter for TCVN-5712. * iconvdata/tcvn5712-1.c (BODY for FROM_LOOP): Don't consider inptr and inend for must_buffer_ch. * wcsmbs/tst-mbsnrtowcs.c: Remove file. * wcsmbs/Makefile (tests): Remove tst-mbsnrtowcs. * stdio-common/Makefile (tests): Remove bug15. (bug15-ENV): Remove macro. * stdio-common/bug15.c: Remove, we do not support vi_VN.TCVN5712-1 anymore. localedata: * SUPPORTED: Remove vi_VN.TCVN/TCVN5712-1. * tst-strptime.c: Remove, we do not support vi_VN.TCVN5712-1 anymore. * Makefile (LOCALES): Remove vi_VN.TCVN5712-1 from list. (tests): Remove tst-strptime. --- wcsmbs/Makefile | 3 +- wcsmbs/tst-mbsnrtowcs.c | 83 ------------------------------------------------- 2 files changed, 1 insertion(+), 85 deletions(-) delete mode 100644 wcsmbs/tst-mbsnrtowcs.c (limited to 'wcsmbs') diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index c4d31d9ab3..99d3d28ae7 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -44,8 +44,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ strop-tests := wcscmp wmemcmp wcslen wcschr wcsrchr wcscpy tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ - tst-c16c32-1 tst-mbsnrtowcs \ - wcsatcliff $(addprefix test-,$(strop-tests)) + tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests)) include ../Rules diff --git a/wcsmbs/tst-mbsnrtowcs.c b/wcsmbs/tst-mbsnrtowcs.c deleted file mode 100644 index 29ff7c26a8..0000000000 --- a/wcsmbs/tst-mbsnrtowcs.c +++ /dev/null @@ -1,83 +0,0 @@ -/* Copyright (C) 2012 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Tulio Magno Quites Machado Filho , - 2012. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* Test bugzilla 13691 */ - -#include -#include -#include -#include - -static int -do_test (void) -{ - const char * in = "A"; - const char *inbuf = in; - size_t inlen = strchr (in, '\0') - inbuf; - - wchar_t out[5]; - mbstate_t ps; - - const char *locale = "vi_VN.TCVN5712-1"; - if (!setlocale (LC_ALL, locale)) - { - printf ("Locale not available.\n"); - return 1; - } - - memset (&ps, '\0', sizeof (ps)); - memset (out, '\0', sizeof (out)); - - /* If the bug isn't fixed, it isn't going to return from mbsnrtowcs due to - an assert(). */ - size_t n = mbsnrtowcs (out, &inbuf, inlen, sizeof(out) - 1, &ps); - - int result = 0; - - if (n != 1) - { - printf ("n = %zu, expected 1\n", n); - result = 1; - } - - int i; - printf ("in = "); - for (i = 0; i < inlen; i++) - { - printf ("0x%X ", in[i]); - } - printf ("\n"); - - char * outb = (char *) out; - printf ("out ="); - for (i = 0; i < sizeof (out); i++) - { - if (i % 4 == 0) - { - printf (" 0x"); - } - printf ("%X", outb[i]); - } - printf ("\n"); - - return result; -} - -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" -- cgit 1.4.1