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-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz | |
*: 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) defn = xzalloc(sizeof(*defn)); f = xfopen(filename, "r"); - while ((buf = xmalloc_getline(f)) != NULL) { + while ((buf = xmalloc_fgetline(f)) != NULL) { #if ENABLE_DESKTOP /* Trailing "\" concatenates lines */ char *p; while ((p = last_char_is(buf, '\\')) != NULL) { *p = '\0'; - rest_of_line = xmalloc_getline(f); + rest_of_line = xmalloc_fgetline(f); if (!rest_of_line) break; p = xasprintf("%s%s", buf, rest_of_line); @@ -1051,7 +1051,7 @@ static char *run_mapping(char *physical, struct mapping_defn_t *map) /* If the mapping script exited successfully, try to * grab a line of output and use that as the name of the * logical interface. */ - char *new_logical = xmalloc_getline(out); + char *new_logical = xmalloc_fgetline(out); if (new_logical) { /* 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) // if code = -1 then just return this number // if code != -1 then checks whether the number equals the code // if not equal -> die saying msg - while ((answer = xmalloc_getline(stdin)) != NULL) + while ((answer = xmalloc_fgetline(stdin)) != NULL) if (strlen(answer) <= 3 || '-' != answer[3]) break; if (answer) { @@ -211,7 +211,7 @@ static char *sane(char *str) static void pop3_checkr(const char *fmt, const char *param, char **ret) { const char *msg = command(fmt, param); - char *answer = xmalloc_getline(stdin); + char *answer = xmalloc_fgetline(stdin); if (answer && '+' == *answer) { alarm(0); if (ret) |