*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/

This commit is contained in:
Denis Vlasenko
2008-03-26 20:04:27 +00:00
parent ce7eb4443c
commit 8ee649a02e
26 changed files with 48 additions and 44 deletions

View File

@@ -85,7 +85,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
patch_file = xfopen_stdin(i);
}
patch_line = xmalloc_getline(patch_file);
patch_line = xmalloc_fgetline(patch_file);
while (patch_line) {
FILE *src_stream;
FILE *dst_stream;
@@ -106,7 +106,7 @@ int patch_main(int argc ATTRIBUTE_UNUSED, char **argv)
/* Extract the filename used before the patch was generated */
new_filename = extract_filename(patch_line, patch_level, "--- ");
// was old_filename above
patch_line = xmalloc_getline(patch_file);
patch_line = xmalloc_fgetline(patch_file);
if (!patch_line) goto quit;
} while (!new_filename);
free(new_filename); // "source" filename is irrelevant

View File

@@ -1028,7 +1028,7 @@ static void process_files(void)
if (rfile) {
char *line;
while ((line = xmalloc_getline(rfile))
while ((line = xmalloc_fgetline(rfile))
!= NULL)
append(line);
xprint_and_close_file(rfile);
@@ -1273,7 +1273,7 @@ int sed_main(int argc ATTRIBUTE_UNUSED, char **argv)
char *line;
FILE *cmdfile;
cmdfile = xfopen(opt_f->data, "r");
while ((line = xmalloc_getline(cmdfile)) != NULL) {
while ((line = xmalloc_fgetline(cmdfile)) != NULL) {
add_cmd(line);
free(line);
}