aboutsummaryrefslogtreecommitdiff
path: root/findutils/grep.c
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-12 22:43:20 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-10-12 22:43:20 +0000
commit60c92512459bf4e5a072387dfa4d03ae85035cba (patch)
tree08de18a783dbb518dfbe5832751a214aff7d0a7a /findutils/grep.c
parent7b23873aac83f79d2d5694963fd34a61ed0543c1 (diff)
downloadbusybox-w32-60c92512459bf4e5a072387dfa4d03ae85035cba.tar.gz
busybox-w32-60c92512459bf4e5a072387dfa4d03ae85035cba.tar.bz2
busybox-w32-60c92512459bf4e5a072387dfa4d03ae85035cba.zip
bb_get_[chomped]line_from_file wasn't descriptive enough.
Renaming... git-svn-id: svn://busybox.net/trunk/busybox@16375 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'findutils/grep.c')
-rw-r--r--findutils/grep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/findutils/grep.c b/findutils/grep.c
index ce975e771..c0c495bd1 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -123,7 +123,7 @@ static int grep_file(FILE *file)
123 int idx = 0; /* used for iteration through the circular buffer */ 123 int idx = 0; /* used for iteration through the circular buffer */
124#endif /* ENABLE_FEATURE_GREP_CONTEXT */ 124#endif /* ENABLE_FEATURE_GREP_CONTEXT */
125 125
126 while ((line = bb_get_chomped_line_from_file(file)) != NULL) { 126 while ((line = xmalloc_getline(file)) != NULL) {
127 llist_t *pattern_ptr = pattern_head; 127 llist_t *pattern_ptr = pattern_head;
128 grep_list_data_t * gl; 128 grep_list_data_t * gl;
129 129
@@ -280,7 +280,7 @@ static void load_regexes_from_file(llist_t *fopt)
280 fopt = cur->link; 280 fopt = cur->link;
281 free(cur); 281 free(cur);
282 f = xfopen(ffile, "r"); 282 f = xfopen(ffile, "r");
283 while ((line = bb_get_chomped_line_from_file(f)) != NULL) { 283 while ((line = xmalloc_getline(f)) != NULL) {
284 llist_add_to(&pattern_head, 284 llist_add_to(&pattern_head,
285 new_grep_list_data(line, PATTERN_MEM_A)); 285 new_grep_list_data(line, PATTERN_MEM_A));
286 } 286 }