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 /util-linux | |
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 '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 10c57fd61..7630153e7 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
@@ -23,7 +23,7 @@ static void bb_dump_addfile(char *name) | |||
23 | 23 | ||
24 | fp = xfopen(name, "r"); | 24 | fp = xfopen(name, "r"); |
25 | 25 | ||
26 | while ((buf = xmalloc_getline(fp)) != NULL) { | 26 | while ((buf = xmalloc_fgetline(fp)) != NULL) { |
27 | p = skip_whitespace(buf); | 27 | p = skip_whitespace(buf); |
28 | 28 | ||
29 | if (*p && (*p != '#')) { | 29 | if (*p && (*p != '#')) { |
@@ -135,7 +135,7 @@ int hexdump_main(int argc, char **argv) | |||
135 | char *buf; | 135 | char *buf; |
136 | fp = xfopen(*argv, "r"); | 136 | fp = xfopen(*argv, "r"); |
137 | jump_in: | 137 | jump_in: |
138 | while ((buf = xmalloc_getline(fp)) != NULL) { | 138 | while ((buf = xmalloc_fgetline(fp)) != NULL) { |
139 | p = buf; | 139 | p = buf; |
140 | while (1) { | 140 | while (1) { |
141 | /* skip address or previous byte */ | 141 | /* skip address or previous byte */ |
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 0edaf1047..5a8f1d918 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c | |||
@@ -68,7 +68,7 @@ static void make_device(char *path, int delete) | |||
68 | if (!fp) | 68 | if (!fp) |
69 | goto end_parse; | 69 | goto end_parse; |
70 | 70 | ||
71 | while ((vline = line = xmalloc_getline(fp)) != NULL) { | 71 | while ((vline = line = xmalloc_fgetline(fp)) != NULL) { |
72 | int field; | 72 | int field; |
73 | 73 | ||
74 | /* A pristine copy for command execution. */ | 74 | /* A pristine copy for command execution. */ |
diff --git a/util-linux/mount.c b/util-linux/mount.c index bd5f27b2e..351a31a73 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -362,7 +362,7 @@ static llist_t *get_block_backed_filesystems(void) | |||
362 | f = fopen(filesystems[i], "r"); | 362 | f = fopen(filesystems[i], "r"); |
363 | if (!f) continue; | 363 | if (!f) continue; |
364 | 364 | ||
365 | while ((buf = xmalloc_getline(f)) != 0) { | 365 | while ((buf = xmalloc_fgetline(f)) != NULL) { |
366 | if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) | 366 | if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) |
367 | continue; | 367 | continue; |
368 | fs = skip_whitespace(buf); | 368 | fs = skip_whitespace(buf); |