diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-26 20:04:27 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-03-26 20:04:27 +0000 |
commit | 8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch) | |
tree | cf13ce448542a36595264ad53397a0633ffedcc8 /networking | |
parent | ce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff) | |
download | busybox-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')
-rw-r--r-- | networking/ifupdown.c | 6 | ||||
-rw-r--r-- | networking/sendmail.c | 4 |
2 files changed, 5 insertions, 5 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, |
diff --git a/networking/sendmail.c b/networking/sendmail.c index 378c4bb2e..973d712b9 100644 --- a/networking/sendmail.c +++ b/networking/sendmail.c | |||
@@ -170,7 +170,7 @@ static int smtp_checkp(const char *fmt, const char *param, int code) | |||
170 | // if code = -1 then just return this number | 170 | // if code = -1 then just return this number |
171 | // if code != -1 then checks whether the number equals the code | 171 | // if code != -1 then checks whether the number equals the code |
172 | // if not equal -> die saying msg | 172 | // if not equal -> die saying msg |
173 | while ((answer = xmalloc_getline(stdin)) != NULL) | 173 | while ((answer = xmalloc_fgetline(stdin)) != NULL) |
174 | if (strlen(answer) <= 3 || '-' != answer[3]) | 174 | if (strlen(answer) <= 3 || '-' != answer[3]) |
175 | break; | 175 | break; |
176 | if (answer) { | 176 | if (answer) { |
@@ -211,7 +211,7 @@ static char *sane(char *str) | |||
211 | static void pop3_checkr(const char *fmt, const char *param, char **ret) | 211 | static void pop3_checkr(const char *fmt, const char *param, char **ret) |
212 | { | 212 | { |
213 | const char *msg = command(fmt, param); | 213 | const char *msg = command(fmt, param); |
214 | char *answer = xmalloc_getline(stdin); | 214 | char *answer = xmalloc_fgetline(stdin); |
215 | if (answer && '+' == *answer) { | 215 | if (answer && '+' == *answer) { |
216 | alarm(0); | 216 | alarm(0); |
217 | if (ret) | 217 | if (ret) |