summaryrefslogtreecommitdiff
path: root/networking
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-12 22:43:20 +0000
committerDenis Vlasenko2006-10-12 22:43:20 +0000
commit2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c (patch)
tree08de18a783dbb518dfbe5832751a214aff7d0a7a /networking
parent372686bde7b4c0abaf01123d8dda1dc6ab9a92e2 (diff)
downloadbusybox-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.zip
busybox-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.tar.gz
bb_get_[chomped]line_from_file wasn't descriptive enough.
Renaming...
Diffstat (limited to 'networking')
-rw-r--r--networking/dnsd.c2
-rw-r--r--networking/ifupdown.c2
-rw-r--r--networking/nameif.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 35f6c10..6f9dc5d 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -138,7 +138,7 @@ static int getfileentry(FILE * fp, struct dns_entry *s)
char *r, *name;
restart:
- r = bb_get_line_from_file(fp);
+ r = xmalloc_fgets(fp);
if (!r)
return -1;
while (*r == ' ' || *r == '\t') {
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index c1dc1d3..00eb576 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -649,7 +649,7 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
f = xfopen(filename, "r");
- while ((buf = bb_get_chomped_line_from_file(f)) != NULL) {
+ while ((buf = xmalloc_getline(f)) != NULL) {
char *buf_ptr = buf;
firstword = next_word(&buf_ptr);
diff --git a/networking/nameif.c b/networking/nameif.c
index f60a97e..385e7fb 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -91,7 +91,7 @@ int nameif_main(int argc, char **argv)
} else {
ifh = xfopen(fname, "r");
- while ((line = bb_get_line_from_file(ifh)) != NULL) {
+ while ((line = xmalloc_fgets(ifh)) != NULL) {
char *line_ptr;
size_t name_length;