bb_get_[chomped]line_from_file wasn't descriptive enough.
Renaming...
This commit is contained in:
@ -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') {
|
||||
|
@ -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);
|
||||
|
@ -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;
|
||||
|
||||
|
Reference in New Issue
Block a user