diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-26 20:04:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-26 20:04:27 +0000 |
| commit | 8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch) | |
| tree | cf13ce448542a36595264ad53397a0633ffedcc8 /editors | |
| parent | ce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff) | |
| download | busybox-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz | |
*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/patch.c | 4 | ||||
| -rw-r--r-- | editors/sed.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editors/patch.c b/editors/patch.c index 6f42b835c..1c9e97005 100644 --- a/editors/patch.c +++ b/editors/patch.c @@ -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 diff --git a/editors/sed.c b/editors/sed.c index 32911f8f9..f85884534 100644 --- a/editors/sed.c +++ b/editors/sed.c @@ -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); } |