diff options
| author | Denis Vlasenko | 2008-03-26 20:04:27 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-03-26 20:04:27 +0000 |
| commit | 8ee649a02e97e9d4e770a8138ba94c0f3ddd8055 (patch) | |
| tree | cf13ce448542a36595264ad53397a0633ffedcc8 /util-linux | |
| parent | ce7eb4443cc90038aabc19a8b7b8f25e4b88892e (diff) | |
| download | busybox-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.zip busybox-8ee649a02e97e9d4e770a8138ba94c0f3ddd8055.tar.gz | |
*: more uniform naming: s/xmalloc_getline/xmalloc_fgetline/
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/hexdump.c | 4 | ||||
| -rw-r--r-- | util-linux/mdev.c | 2 | ||||
| -rw-r--r-- | util-linux/mount.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 10c57fd..7630153 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c @@ -23,7 +23,7 @@ static void bb_dump_addfile(char *name) fp = xfopen(name, "r"); - while ((buf = xmalloc_getline(fp)) != NULL) { + while ((buf = xmalloc_fgetline(fp)) != NULL) { p = skip_whitespace(buf); if (*p && (*p != '#')) { @@ -135,7 +135,7 @@ int hexdump_main(int argc, char **argv) char *buf; fp = xfopen(*argv, "r"); jump_in: - while ((buf = xmalloc_getline(fp)) != NULL) { + while ((buf = xmalloc_fgetline(fp)) != NULL) { p = buf; while (1) { /* skip address or previous byte */ diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 0edaf10..5a8f1d9 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -68,7 +68,7 @@ static void make_device(char *path, int delete) if (!fp) goto end_parse; - while ((vline = line = xmalloc_getline(fp)) != NULL) { + while ((vline = line = xmalloc_fgetline(fp)) != NULL) { int field; /* A pristine copy for command execution. */ diff --git a/util-linux/mount.c b/util-linux/mount.c index bd5f27b..351a31a 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -362,7 +362,7 @@ static llist_t *get_block_backed_filesystems(void) f = fopen(filesystems[i], "r"); if (!f) continue; - while ((buf = xmalloc_getline(f)) != 0) { + while ((buf = xmalloc_fgetline(f)) != NULL) { if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) continue; fs = skip_whitespace(buf); |