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 /coreutils | |
| parent | ce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff) | |
| download | busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.bz2 busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.zip | |
*: 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 e617ef28f..7a44d1088 100644 --- a/coreutils/cut.c +++ b/coreutils/cut.c | |||
| @@ -51,7 +51,7 @@ static void cut_file(FILE *file, char delim) | |||
| 51 | unsigned int linenum = 0; /* keep these zero-based to be consistent */ | 51 | unsigned int linenum = 0; /* keep these zero-based to be consistent */ |
| 52 | 52 | ||
| 53 | /* go through every line in the file */ | 53 | /* go through every line in the file */ |
| 54 | while ((line = xmalloc_getline(file)) != NULL) { | 54 | while ((line = xmalloc_fgetline(file)) != NULL) { |
| 55 | 55 | ||
| 56 | /* set up a list so we can keep track of what's been printed */ | 56 | /* set up a list so we can keep track of what's been printed */ |
| 57 | char * printed = xzalloc(strlen(line) * sizeof(char)); | 57 | char * printed = xzalloc(strlen(line) * sizeof(char)); |
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c index 080eac5f4..2e1c96459 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) | |||
| 115 | 115 | ||
| 116 | pre_computed_stream = xfopen_stdin(argv[0]); | 116 | pre_computed_stream = xfopen_stdin(argv[0]); |
| 117 | 117 | ||
| 118 | while ((line = xmalloc_getline(pre_computed_stream)) != NULL) { | 118 | while ((line = xmalloc_fgetline(pre_computed_stream)) != NULL) { |
| 119 | char *filename_ptr; | 119 | char *filename_ptr; |
| 120 | 120 | ||
| 121 | count_total++; | 121 | count_total++; |
diff --git a/coreutils/sort.c b/coreutils/sort.c index 15566ce2b..a54be7269 100644 --- a/coreutils/sort.c +++ b/coreutils/sort.c | |||
| @@ -150,9 +150,9 @@ static struct sort_key *add_key(void) | |||
| 150 | #define GET_LINE(fp) \ | 150 | #define GET_LINE(fp) \ |
| 151 | ((option_mask32 & FLAG_z) \ | 151 | ((option_mask32 & FLAG_z) \ |
| 152 | ? bb_get_chunk_from_file(fp, NULL) \ | 152 | ? bb_get_chunk_from_file(fp, NULL) \ |
| 153 | : xmalloc_getline(fp)) | 153 | : xmalloc_fgetline(fp)) |
| 154 | #else | 154 | #else |
| 155 | #define GET_LINE(fp) xmalloc_getline(fp) | 155 | #define GET_LINE(fp) xmalloc_fgetline(fp) |
| 156 | #endif | 156 | #endif |
| 157 | 157 | ||
| 158 | /* Iterate through keys list and perform comparisons */ | 158 | /* Iterate through keys list and perform comparisons */ |
diff --git a/coreutils/uniq.c b/coreutils/uniq.c index d0729607c..32327c6ce 100644 --- a/coreutils/uniq.c +++ b/coreutils/uniq.c | |||
| @@ -71,7 +71,7 @@ int uniq_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 71 | dups = 0; | 71 | dups = 0; |
| 72 | 72 | ||
| 73 | /* gnu uniq ignores newlines */ | 73 | /* gnu uniq ignores newlines */ |
| 74 | while ((s1 = xmalloc_getline(in)) != NULL) { | 74 | while ((s1 = xmalloc_fgetline(in)) != NULL) { |
| 75 | e1 = s1; | 75 | e1 = s1; |
| 76 | for (i = skip_fields; i; i--) { | 76 | for (i = skip_fields; i; i--) { |
| 77 | e1 = skip_whitespace(e1); | 77 | e1 = skip_whitespace(e1); |
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c index 4c619dec5..c06747622 100644 --- a/coreutils/uudecode.c +++ b/coreutils/uudecode.c | |||
| @@ -18,7 +18,7 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream) | |||
| 18 | { | 18 | { |
| 19 | char *line; | 19 | char *line; |
| 20 | 20 | ||
| 21 | while ((line = xmalloc_getline(src_stream)) != NULL) { | 21 | while ((line = xmalloc_fgetline(src_stream)) != NULL) { |
| 22 | int encoded_len, str_len; | 22 | int encoded_len, str_len; |
| 23 | char *line_ptr, *dst; | 23 | char *line_ptr, *dst; |
| 24 | 24 | ||
| @@ -151,7 +151,7 @@ int uudecode_main(int argc ATTRIBUTE_UNUSED, char **argv) | |||
| 151 | src_stream = xfopen_stdin(*argv); | 151 | src_stream = xfopen_stdin(*argv); |
| 152 | 152 | ||
| 153 | /* Search for the start of the encoding */ | 153 | /* Search for the start of the encoding */ |
| 154 | while ((line = xmalloc_getline(src_stream)) != NULL) { | 154 | while ((line = xmalloc_fgetline(src_stream)) != NULL) { |
| 155 | void (*decode_fn_ptr)(FILE * src, FILE * dst); | 155 | void (*decode_fn_ptr)(FILE * src, FILE * dst); |
| 156 | char *line_ptr; | 156 | char *line_ptr; |
| 157 | FILE *dst_stream; | 157 | FILE *dst_stream; |