summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2003-06-18 07:37:29 +0000
committerJim Meyering <jim@meyering.net>2003-06-18 07:37:29 +0000
commit4f1ec3fd5446ccf1b15e2374566c1c93a25c46b0 (patch)
tree515131588d1efcfe444e77ad22f24f9633bc1658 /src
parent9341d1f804522ed36abb0b61c73a96880c91ee93 (diff)
downloadcoreutils-4f1ec3fd5446ccf1b15e2374566c1c93a25c46b0.tar.xz
Reflect renaming: readline -> readlinebuffer.
Diffstat (limited to 'src')
-rw-r--r--src/comm.c6
-rw-r--r--src/join.c2
-rw-r--r--src/nl.c2
-rw-r--r--src/uniq.c6
4 files changed, 8 insertions, 8 deletions
diff --git a/src/comm.c b/src/comm.c
index 02066ec91..26716dfc1 100644
--- a/src/comm.c
+++ b/src/comm.c
@@ -159,7 +159,7 @@ compare_files (char **infiles)
return 1;
}
- thisline[i] = readline (thisline[i], streams[i]);
+ thisline[i] = readlinebuffer (thisline[i], streams[i]);
}
while (thisline[0] || thisline[1])
@@ -199,9 +199,9 @@ compare_files (char **infiles)
/* Step the file the line came from.
If the files match, step both files. */
if (order >= 0)
- thisline[1] = readline (thisline[1], streams[1]);
+ thisline[1] = readlinebuffer (thisline[1], streams[1]);
if (order <= 0)
- thisline[0] = readline (thisline[0], streams[0]);
+ thisline[0] = readlinebuffer (thisline[0], streams[0]);
}
/* Free all storage and close all input streams. */
diff --git a/src/join.c b/src/join.c
index c04a69ccd..f6d9b06a0 100644
--- a/src/join.c
+++ b/src/join.c
@@ -260,7 +260,7 @@ get_line (FILE *fp, struct line *line)
{
initbuffer (&line->buf);
- if (! readline (&line->buf, fp))
+ if (! readlinebuffer (&line->buf, fp))
{
free (line->buf.buffer);
line->buf.buffer = NULL;
diff --git a/src/nl.c b/src/nl.c
index bb3adfd56..4f372d0d8 100644
--- a/src/nl.c
+++ b/src/nl.c
@@ -401,7 +401,7 @@ check_section (void)
static void
process_file (FILE *fp)
{
- while (readline (&line_buf, fp))
+ while (readlinebuffer (&line_buf, fp))
{
switch ((int) check_section ())
{
diff --git a/src/uniq.c b/src/uniq.c
index c945be391..e5d74d68a 100644
--- a/src/uniq.c
+++ b/src/uniq.c
@@ -302,7 +302,7 @@ check_file (const char *infile, const char *outfile)
{
char *thisfield;
size_t thislen;
- if (readline (thisline, istream) == 0)
+ if (readlinebuffer (thisline, istream) == 0)
break;
thisfield = find_field (thisline);
thislen = thisline->length - 1 - (thisfield - thisline->buffer);
@@ -325,7 +325,7 @@ check_file (const char *infile, const char *outfile)
int match_count = 0;
int first_delimiter = 1;
- if (readline (prevline, istream) == 0)
+ if (readlinebuffer (prevline, istream) == 0)
goto closefiles;
prevfield = find_field (prevline);
prevlen = prevline->length - 1 - (prevfield - prevline->buffer);
@@ -335,7 +335,7 @@ check_file (const char *infile, const char *outfile)
bool match;
char *thisfield;
size_t thislen;
- if (readline (thisline, istream) == 0)
+ if (readlinebuffer (thisline, istream) == 0)
break;
thisfield = find_field (thisline);
thislen = thisline->length - 1 - (thisfield - thisline->buffer);