diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-11-26 12:54:39 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-11-26 12:54:39 +0000 |
| commit | 12da14a59135fe331f294b91488c1bdf55b35b4e (patch) | |
| tree | 32c04ca07391dfc8df76cd782707e9f772016dbc | |
| parent | bd5dadac87467eec9d6ffc3f1b11897ea052a636 (diff) | |
| download | glibc-12da14a59135fe331f294b91488c1bdf55b35b4e.tar.gz glibc-12da14a59135fe331f294b91488c1bdf55b35b4e.tar.xz glibc-12da14a59135fe331f294b91488c1bdf55b35b4e.zip | |
Fix warnings in fwscanf / rewind tests.
This patch fixes "set but not used" warnings in the tests libio/bug-rewind.c and libio/bug-rewind2.c by checking the return values from fwscanf and making the tests fail if those values aren't as expected. Tested for x86_64. * libio/bug-rewind.c (do_test): Check fwscanf return values. * libio/bug-rewind2.c (do_test): Likewise.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | libio/bug-rewind.c | 10 | ||||
| -rw-r--r-- | libio/bug-rewind2.c | 5 |
3 files changed, 18 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 3ae83e659f..5581f0818d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2014-11-26 Joseph Myers <joseph@codesourcery.com> + * libio/bug-rewind.c (do_test): Check fwscanf return values. + * libio/bug-rewind2.c (do_test): Likewise. + * debug/test-stpcpy_chk-ifunc.c: Remove file. * debug/test-strcpy_chk-ifunc.c: Likewise. * wcsmbs/test-wcschr-ifunc.c: Likewise. diff --git a/libio/bug-rewind.c b/libio/bug-rewind.c index 4f8242df3d..1734de285f 100644 --- a/libio/bug-rewind.c +++ b/libio/bug-rewind.c @@ -52,9 +52,19 @@ do_test (void) rewind (fptr); ret1 = fwscanf (fptr, L"%c%c", &arg1, &arg2); + if (ret1 != 2) + { + printf ("first fwscanf returned %d, expected 2\n", ret1); + return 3; + } rewind (fptr); ret2 = fwscanf (fptr, L"%c%n%c", &arg1, &num, &arg2); + if (ret2 != 2) + { + printf ("second fwscanf returned %d, expected 2\n", ret2); + return 4; + } if (arg2 != 'd') { diff --git a/libio/bug-rewind2.c b/libio/bug-rewind2.c index 51b5744330..496f628675 100644 --- a/libio/bug-rewind2.c +++ b/libio/bug-rewind2.c @@ -45,6 +45,11 @@ do_test (void) rewind (fp); ret = fwscanf (fp, L"%c", dummy); + if (ret != 1) + { + printf ("fwscanf returned %d, expected 1\n", ret); + result = 1; + } printf ("current pos = %ld\n", ftell (fp)); if (ftell (fp) != 1) |