summaryrefslogtreecommitdiff
path: root/stdio-common
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2002-01-19 17:51:34 +0000
committerUlrich Drepper <drepper@redhat.com>2002-01-19 17:51:34 +0000
commit284749da8bfa7720960381f6681157f6ab44547d (patch)
tree04d7d91eb0790ff56bcda167adcd1f3e09ffeed5 /stdio-common
parent53e9699b6d8562d1f64bb16b558811b766da4e8b (diff)
downloadglibc-284749da8bfa7720960381f6681157f6ab44547d.tar.gz
Update.
2002-01-19 Ulrich Drepper <drepper@redhat.com> * libio/fileops.c (_IO_file_underflow_mmap): Don't define as static. Set offset if read end wasn't the buffer end. (_IO_file_seekoff_mmap): New function. (_IO_file_xsgetn_mmap): New function. (_IO_file_jumps_mmap): Use the two new functions. * libio/wfileops.c (_IO_wfile_underflow_mmap): Handle end read buffer != end buffer. * libio/libioP.h: Declare _IO_file_seekoff_mmap and _IO_file_underflow_mmap. * libio/iofopen.c: Don't position file descriptor at end of file. * libio/tst-widetext.c: Improve error messages. * stdio-common/tst-rndseek.c: Likewise.
Diffstat (limited to 'stdio-common')
-rw-r--r--stdio-common/tst-rndseek.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/stdio-common/tst-rndseek.c b/stdio-common/tst-rndseek.c
index 82a4cfd83e..41d99e4a22 100644
--- a/stdio-common/tst-rndseek.c
+++ b/stdio-common/tst-rndseek.c
@@ -15,7 +15,7 @@ static int do_test (void);
static int
-fp_test (FILE *fp)
+fp_test (const char *name, FILE *fp)
{
int result = 0;
int rounds = 10000;
@@ -28,7 +28,7 @@ fp_test (FILE *fp)
if (fseek (fp, idx, SEEK_SET) != 0)
{
- printf ("%d: fseek failed: %m\n", rounds);
+ printf ("%s: %d: fseek failed: %m\n", name, rounds);
result = 1;
break;
}
@@ -37,8 +37,8 @@ fp_test (FILE *fp)
ch2 = tempdata[idx];
if (ch1 != ch2)
{
- printf ("%d: character at index %d not what is expected ('%c' vs '%c')\n",
- rounds, idx, ch1, ch2);
+ printf ("%s: %d: character at index %d not what is expected ('%c' vs '%c')\n",
+ name, rounds, idx, ch1, ch2);
result = 1;
break;
}
@@ -47,8 +47,8 @@ fp_test (FILE *fp)
ch2 = tempdata[idx + 1];
if (ch1 != ch2)
{
- printf ("%d: character at index %d not what is expected ('%c' vs '%c')\n",
- rounds, idx + 1, ch1, ch2);
+ printf ("%s: %d: character at index %d not what is expected ('%c' vs '%c')\n",
+ name, rounds, idx + 1, ch1, ch2);
result = 1;
break;
}
@@ -83,7 +83,7 @@ do_test (void)
/* First create some temporary data. */
for (i = 0; i < sizeof (tempdata); ++i)
- tempdata[i] = (char) random ();
+ tempdata[i] = 'a' + random () % 26;
/* Write this data to a file. */
if (TEMP_FAILURE_RETRY (write (fd, tempdata, sizeof (tempdata)))
@@ -121,23 +121,23 @@ do_test (void)
}
}
- result = fp_test (fp);
+ result = fp_test ("fdopen(\"r\")", fp);
fp = fopen (fname, "r");
- result |= fp_test (fp);
+ result |= fp_test ("fopen(\"r\")", fp);
fp = fopen64 (fname, "r");
- result |= fp_test (fp);
+ result |= fp_test ("fopen64(\"r\")", fp);
/* The "rw" mode will prevent the mmap-using code from being used. */
fp = fdopen (fd, "rw");
- result = fp_test (fp);
+ result = fp_test ("fdopen(\"rw\")", fp);
fp = fopen (fname, "rw");
- result |= fp_test (fp);
+ result |= fp_test ("fopen(\"rw\")", fp);
fp = fopen64 (fname, "rw");
- result |= fp_test (fp);
+ result |= fp_test ("fopen64(\"rw\")", fp);
return result;
}