diff options
author | Andreas Jaeger <aj@suse.de> | 2000-08-18 09:34:18 +0000 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2000-08-18 09:34:18 +0000 |
commit | ec7956d922c85fc6154062ce5ba58fe40e9d5901 (patch) | |
tree | 3a990101ac791acb2841899d63594eb3d34e43e3 /localedata/tests-mbwc/tst_funcs.h | |
parent | a0c9a28b7cc5d8b85d4e65109729ad9a7a9ebe00 (diff) | |
download | glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.gz glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.tar.bz2 glibc-ec7956d922c85fc6154062ce5ba58fe40e9d5901.zip |
* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.
(TST_DECL_VARS): Don't declare err_flg.
(TST_GET_ERRET): Don't set err_flg.
(TST_GET_ERRET_SEQ): Likewise.
(TST_IF_RETURN): Don't use err_flg, check err_exp directly.
* tests-mbwc/dat_swscanf.c: Don't set err_flg.
* tests-mbwc/dat_iswalnum.c: Likewise.
* tests-mbwc/dat_iswalpha.c: Likewise.
* tests-mbwc/dat_iswcntrl.c: Likewise.
* tests-mbwc/dat_iswctype.c: Likewise.
* tests-mbwc/dat_iswdigit.c: Likewise.
* tests-mbwc/dat_iswgraph.c: Likewise.
* tests-mbwc/dat_iswlower.c: Likewise.
* tests-mbwc/dat_iswprint.c: Likewise.
* tests-mbwc/dat_iswpunct.c: Likewise.
* tests-mbwc/dat_iswspace.c: Likewise.
* tests-mbwc/dat_iswupper.c: Likewise.
* tests-mbwc/dat_iswxdigit.c: Likewise.
* tests-mbwc/dat_mblen.c: Likewise.
* tests-mbwc/dat_mbrlen.c: Likewise.
* tests-mbwc/dat_mbrtowc.c: Likewise.
* tests-mbwc/dat_mbsrtowcs.c: Likewise.
* tests-mbwc/dat_mbstowcs.c: Likewise.
* tests-mbwc/dat_mbtowc.c: Likewise.
* tests-mbwc/dat_strcoll.c: Likewise.
* tests-mbwc/dat_strfmon.c: Likewise.
* tests-mbwc/dat_strxfrm.c: Likewise.
* tests-mbwc/dat_swscanf.c: Likewise.
* tests-mbwc/dat_towctrans.c: Likewise.
* tests-mbwc/dat_towlower.c: Likewise.
* tests-mbwc/dat_towupper.c: Likewise.
* tests-mbwc/dat_wcrtomb.c: Likewise.
* tests-mbwc/dat_wcscat.c: Likewise.
* tests-mbwc/dat_wcschr.c: Likewise.
* tests-mbwc/dat_wcscmp.c: Likewise.
* tests-mbwc/dat_wcscoll.c: Likewise.
* tests-mbwc/dat_wcscpy.c: Likewise.
* tests-mbwc/dat_wcscspn.c: Likewise.
* tests-mbwc/dat_wcslen.c: Likewise.
* tests-mbwc/dat_wcsncat.c: Likewise.
* tests-mbwc/dat_wcsncmp.c: Likewise.
* tests-mbwc/dat_wcsncpy.c: Likewise.
* tests-mbwc/dat_wcspbrk.c: Likewise.
* tests-mbwc/dat_wcsrtombs.c: Likewise.
* tests-mbwc/dat_wcsspn.c: Likewise.
* tests-mbwc/dat_wcsstr.c: Likewise.
* tests-mbwc/dat_wcstod.c: Likewise.
* tests-mbwc/dat_wcstok.c: Likewise.
* tests-mbwc/dat_wcstombs.c: Likewise.
* tests-mbwc/dat_wcswidth.c: Likewise.
* tests-mbwc/dat_wcsxfrm.c: Likewise.
* tests-mbwc/dat_wctob.c: Likewise.
* tests-mbwc/dat_wctomb.c: Likewise.
* tests-mbwc/dat_wctrans.c: Likewise.
* tests-mbwc/dat_wctype.c: Likewise.
* tests-mbwc/dat_wcwidth.c: Likewise.
* tests-mbwc/dat_isw-funcs.h: Fix comment.
2000-08-18 Andreas Jaeger <aj@suse.de>
* tests-mbwc/tst_funcs.h (TMD_ERRET): Don't declare err_flg.
(TST_DECL_VARS): Don't declare err_flg.
(TST_GET_ERRET): Don't set err_flg.
(TST_GET_ERRET_SEQ): Likewise.
(TST_IF_RETURN): Don't use err_flg, check err_exp directly.
* tests-mbwc/dat_swscanf.c: Don't set err_flg.
* tests-mbwc/dat_iswalnum.c: Likewise.
* tests-mbwc/dat_iswalpha.c: Likewise.
* tests-mbwc/dat_iswcntrl.c: Likewise.
* tests-mbwc/dat_iswctype.c: Likewise.
* tests-mbwc/dat_iswdigit.c: Likewise.
* tests-mbwc/dat_iswgraph.c: Likewise.
* tests-mbwc/dat_iswlower.c: Likewise.
* tests-mbwc/dat_iswprint.c: Likewise.
* tests-mbwc/dat_iswpunct.c: Likewise.
* tests-mbwc/dat_iswspace.c: Likewise.
* tests-mbwc/dat_iswupper.c: Likewise.
* tests-mbwc/dat_iswxdigit.c: Likewise.
* tests-mbwc/dat_mblen.c: Likewise.
* tests-mbwc/dat_mbrlen.c: Likewise.
* tests-mbwc/dat_mbrtowc.c: Likewise.
* tests-mbwc/dat_mbsrtowcs.c: Likewise.
* tests-mbwc/dat_mbstowcs.c: Likewise.
* tests-mbwc/dat_mbtowc.c: Likewise.
* tests-mbwc/dat_strcoll.c: Likewise.
* tests-mbwc/dat_strfmon.c: Likewise.
* tests-mbwc/dat_strxfrm.c: Likewise.
* tests-mbwc/dat_swscanf.c: Likewise.
* tests-mbwc/dat_towctrans.c: Likewise.
* tests-mbwc/dat_towlower.c: Likewise.
* tests-mbwc/dat_towupper.c: Likewise.
* tests-mbwc/dat_wcrtomb.c: Likewise.
* tests-mbwc/dat_wcscat.c: Likewise.
* tests-mbwc/dat_wcschr.c: Likewise.
* tests-mbwc/dat_wcscmp.c: Likewise.
* tests-mbwc/dat_wcscoll.c: Likewise.
* tests-mbwc/dat_wcscpy.c: Likewise.
* tests-mbwc/dat_wcscspn.c: Likewise.
* tests-mbwc/dat_wcslen.c: Likewise.
* tests-mbwc/dat_wcsncat.c: Likewise.
* tests-mbwc/dat_wcsncmp.c: Likewise.
* tests-mbwc/dat_wcsncpy.c: Likewise.
* tests-mbwc/dat_wcspbrk.c: Likewise.
* tests-mbwc/dat_wcsrtombs.c: Likewise.
* tests-mbwc/dat_wcsspn.c: Likewise.
* tests-mbwc/dat_wcsstr.c: Likewise.
* tests-mbwc/dat_wcstod.c: Likewise.
* tests-mbwc/dat_wcstok.c: Likewise.
* tests-mbwc/dat_wcstombs.c: Likewise.
* tests-mbwc/dat_wcswidth.c: Likewise.
* tests-mbwc/dat_wcsxfrm.c: Likewise.
* tests-mbwc/dat_wctob.c: Likewise.
* tests-mbwc/dat_wctomb.c: Likewise.
* tests-mbwc/dat_wctrans.c: Likewise.
* tests-mbwc/dat_wctype.c: Likewise.
* tests-mbwc/dat_wcwidth.c: Likewise.
* tests-mbwc/dat_isw-funcs.h: Fix comment.
Diffstat (limited to 'localedata/tests-mbwc/tst_funcs.h')
-rw-r--r-- | localedata/tests-mbwc/tst_funcs.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/localedata/tests-mbwc/tst_funcs.h b/localedata/tests-mbwc/tst_funcs.h index 177ca09567..e686bfef5d 100644 --- a/localedata/tests-mbwc/tst_funcs.h +++ b/localedata/tests-mbwc/tst_funcs.h @@ -53,8 +53,7 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, #define TST_ABS(x) (((x) > 0) ? (x) : -(x)) -#define TMD_ERRET(_type_) int err_flg; \ - int err_val; \ +#define TMD_ERRET(_type_) int err_val; \ int ret_flg; \ _type_ ret_val @@ -87,7 +86,7 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, int warn_count __attribute__ ((unused)); \ int func_id, seq_num = 0; \ const char *locale; \ - int err_flg, err_exp, ret_flg; \ + int err_exp, ret_flg; \ int errno_save = 0; \ _type_ ret_exp; \ _type_ ret @@ -114,13 +113,11 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, for (seq_num=0; seq_num < _count_; seq_num++) #define TST_GET_ERRET(_ofunc_) \ - err_flg = TST_EXPECT (_ofunc_).err_flg; \ err_exp = TST_EXPECT (_ofunc_).err_val; \ ret_flg = TST_EXPECT (_ofunc_).ret_flg; \ ret_exp = TST_EXPECT (_ofunc_).ret_val #define TST_GET_ERRET_SEQ(_ofunc_) \ - err_flg = TST_EXPECT_SEQ (_ofunc_).err_flg; \ err_exp = TST_EXPECT_SEQ (_ofunc_).err_val; \ ret_flg = TST_EXPECT_SEQ (_ofunc_).ret_flg; \ ret_exp = TST_EXPECT_SEQ (_ofunc_).ret_val @@ -131,12 +128,11 @@ extern int result (FILE * fp, char res, const char *func, const char *loc, #define TST_SAVE_ERRNO \ errno_save = errno +/* Test value of ret and of errno if it should have a value. */ #define TST_IF_RETURN(_s_func_) \ - if (err_flg == 1) \ + if (err_exp != 0) \ { \ - /* If no error occured, errno is undefined. Here we check only if \ - errno has the right value if it should have one. */ \ - if ((err_exp == 0) || (errno_save == err_exp)) \ + if (errno_save == err_exp) \ { \ result (fp, C_SUCCESS, _s_func_, locale, rec+1, seq_num+1, 1, \ MS_PASSED); \ |