return 1;
}
- thisline[i] = readline (thisline[i], streams[i]);
+ thisline[i] = readlinebuffer (thisline[i], streams[i]);
}
while (thisline[0] || thisline[1])
/* 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. */
{
initbuffer (&line->buf);
- if (! readline (&line->buf, fp))
+ if (! readlinebuffer (&line->buf, fp))
{
free (line->buf.buffer);
line->buf.buffer = NULL;
static void
process_file (FILE *fp)
{
- while (readline (&line_buf, fp))
+ while (readlinebuffer (&line_buf, fp))
{
switch ((int) check_section ())
{
{
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);
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);
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);