diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-12 22:43:20 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-12 22:43:20 +0000 |
commit | 2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c (patch) | |
tree | 08de18a783dbb518dfbe5832751a214aff7d0a7a /util-linux | |
parent | 372686bde7b4c0abaf01123d8dda1dc6ab9a92e2 (diff) | |
download | busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.tar.gz busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.tar.bz2 busybox-w32-2d5ca60bfb66e0ba7340ab9b4696b872f00adf7c.zip |
bb_get_[chomped]line_from_file wasn't descriptive enough.
Renaming...
Diffstat (limited to 'util-linux')
-rw-r--r-- | util-linux/hexdump.c | 2 | ||||
-rw-r--r-- | util-linux/mount.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c index 03b222dd0..5cb245feb 100644 --- a/util-linux/hexdump.c +++ b/util-linux/hexdump.c | |||
@@ -21,7 +21,7 @@ static void bb_dump_addfile(char *name) | |||
21 | 21 | ||
22 | fp = xfopen(name, "r"); | 22 | fp = xfopen(name, "r"); |
23 | 23 | ||
24 | while ((buf = bb_get_chomped_line_from_file(fp)) != NULL) { | 24 | while ((buf = xmalloc_getline(fp)) != NULL) { |
25 | p = skip_whitespace(buf); | 25 | p = skip_whitespace(buf); |
26 | 26 | ||
27 | if (*p && (*p != '#')) { | 27 | if (*p && (*p != '#')) { |
diff --git a/util-linux/mount.c b/util-linux/mount.c index 5448f1f21..9793b825a 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c | |||
@@ -186,7 +186,7 @@ static llist_t *get_block_backed_filesystems(void) | |||
186 | f = fopen(filesystems[i], "r"); | 186 | f = fopen(filesystems[i], "r"); |
187 | if (!f) continue; | 187 | if (!f) continue; |
188 | 188 | ||
189 | while ((buf = bb_get_chomped_line_from_file(f)) != 0) { | 189 | while ((buf = xmalloc_getline(f)) != 0) { |
190 | if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) | 190 | if (!strncmp(buf, "nodev", 5) && isspace(buf[5])) |
191 | continue; | 191 | continue; |
192 | fs = buf; | 192 | fs = buf; |