aboutsummaryrefslogtreecommitdiff
path: root/networking/ifupdown.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-03-26 20:04:27 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-03-26 20:04:27 +0000
commit8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch)
treecf13ce448542a36595264ad53397a0633ffedcc8 /networking/ifupdown.c
parentce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff)
downloadbusybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz
busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.bz2
busybox-w32-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.zip
*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/
Diffstat (limited to 'networking/ifupdown.c')
-rw-r--r--networking/ifupdown.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 20bb709ce..7c31448e8 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -693,13 +693,13 @@ static struct interfaces_file_t *read_interfaces(const char *filename)
693 defn = xzalloc(sizeof(*defn)); 693 defn = xzalloc(sizeof(*defn));
694 f = xfopen(filename, "r"); 694 f = xfopen(filename, "r");
695 695
696 while ((buf = xmalloc_getline(f)) != NULL) { 696 while ((buf = xmalloc_fgetline(f)) != NULL) {
697#if ENABLE_DESKTOP 697#if ENABLE_DESKTOP
698 /* Trailing "\" concatenates lines */ 698 /* Trailing "\" concatenates lines */
699 char *p; 699 char *p;
700 while ((p = last_char_is(buf, '\\')) != NULL) { 700 while ((p = last_char_is(buf, '\\')) != NULL) {
701 *p = '\0'; 701 *p = '\0';
702 rest_of_line = xmalloc_getline(f); 702 rest_of_line = xmalloc_fgetline(f);
703 if (!rest_of_line) 703 if (!rest_of_line)
704 break; 704 break;
705 p = xasprintf("%s%s", buf, rest_of_line); 705 p = xasprintf("%s%s", buf, rest_of_line);
@@ -1051,7 +1051,7 @@ static char *run_mapping(char *physical, struct mapping_defn_t *map)
1051 /* If the mapping script exited successfully, try to 1051 /* If the mapping script exited successfully, try to
1052 * grab a line of output and use that as the name of the 1052 * grab a line of output and use that as the name of the
1053 * logical interface. */ 1053 * logical interface. */
1054 char *new_logical = xmalloc_getline(out); 1054 char *new_logical = xmalloc_fgetline(out);
1055 1055
1056 if (new_logical) { 1056 if (new_logical) {
1057 /* If we are able to read a line of output from the script, 1057 /* If we are able to read a line of output from the script,