From 2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 12 Oct 2006 22:43:20 +0000 Subject: bb_get_[chomped]line_from_file wasn't descriptive enough. Renaming... --- networking/dnsd.c | 2 +- networking/ifupdown.c | 2 +- networking/nameif.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'networking') diff --git a/networking/dnsd.c b/networking/dnsd.c index 35f6c1096..6f9dc5d67 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 c1dc1d35d..00eb576f4 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 f60a97e8b..385e7fb71 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; -- cgit v1.2.3