diff options
| author | Denis Vlasenko | 2008-03-26 20:04:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-03-26 20:04:27 +0000 |
| commit | 8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch) | |
| tree | cf13ce448542a36595264ad53397a0633ffedcc8 /coreutils | |
| parent | ce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff) | |
| download | busybox-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.zip busybox-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz | |
*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/cut.c | 2 | ||||
| -rw-r--r-- | coreutils/md5_sha1_sum.c | 2 | ||||
| -rw-r--r-- | coreutils/sort.c | 4 | ||||
| -rw-r--r-- | coreutils/uniq.c | 2 | ||||
| -rw-r--r-- | coreutils/uudecode.c | 4 |
5 files changed, 7 insertions, 7 deletions
diff --git a/coreutils/cut.c b/coreutils/cut.c index e617ef2..7a44d10 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c @@ -51,7 +51,7 @@ static void cut_file(FILE *file, char delim) unsigned int linenum = 0; /* keep these zero-based to be consistent */ /* go through every line in the file */ - while ((line = xmalloc_getline(file)) != NULL) { + while ((line = xmalloc_fgetline(file)) != NULL) { /* set up a list so we can keep track of what's been printed */ char * printed = xzalloc(strlen(line) * sizeof(char)); diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 080eac5..2e1c964 100644 --- a/coreutils/md5_sha1_sum.c +++ b/coreutils/md5_sha1_sum.c @@ -115,7 +115,7 @@ int md5_sha1_sum_main(int argc ATTRIBUTE_UNUSED, char **argv) pre_computed_stream = xfopen_stdin(argv[0]); - while ((line = xmalloc_getline(pre_computed_stream)) != NULL) { + while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) { char *filename_ptr; count_total++; diff --git a/coreutils/sort.c b/coreutils/sort.c index 15566ce..a54be72 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c @@ -150,9 +150,9 @@ static struct sort_key *add_key(void) #define GET_LINE(fp) \ ((option_mask32 & FLAG_z) \ ? bb_get_chunk_from_file(fp, NULL) \ - : xmalloc_getline(fp)) + : xmalloc_fgetline(fp)) #else -#define GET_LINE(fp) xmalloc_getline(fp) +#define GET_LINE(fp) xmalloc_fgetline(fp) #endif /* Iterate through keys list and perform comparisons */ diff --git a/coreutils/uniq.c b/coreutils/uniq.c index d072960..32327c6 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c @@ -71,7 +71,7 @@ int uniq_main(int argc ATTRIBUTE_UNUSED, char **argv) dups = 0; /* gnu uniq ignores newlines */ - while ((s1 = xmalloc_getline(in)) != NULL) { + while ((s1 = xmalloc_fgetline(in)) != NULL) { e1 = s1; for (i = skip_fields; i; i--) { e1 = skip_whitespace(e1); diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 4c619de..c067476 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c @@ -18,7 +18,7 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream) { char *line; - while ((line = xmalloc_getline(src_stream)) != NULL) { + while ((line = xmalloc_fgetline(src_stream)) != NULL) { int encoded_len, str_len; char *line_ptr, *dst; @@ -151,7 +151,7 @@ int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) src_stream = xfopen_stdin(*argv); /* Search for the start of the encoding */ - while ((line = xmalloc_getline(src_stream)) != NULL) { + while ((line = xmalloc_fgetline(src_stream)) != NULL) { void (*decode_fn_ptr)(FILE * src, FILE * dst); char *line_ptr; FILE *dst_stream; |