aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-26 23:25:17 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-26 23:25:17 +0000
commitddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0 (patch)
treef4f2aa58fa669aed6e2c50bb7aa648a79ec1873d /miscutils
parentf0ed376eda5d5c25d270e5100a881fb2d801bee6 (diff)
downloadbusybox-ddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0.tar.gz
rename functions to more understandable names
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/readahead.c2
-rw-r--r--miscutils/strings.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index 49cd7fd09..356c40451 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -20,7 +20,7 @@ int readahead_main(int argc, char **argv)
if (argc == 1) bb_show_usage();
while (*++argv) {
- if ((f = bb_wfopen(*argv, "r")) != NULL) {
+ if ((f = fopen_or_warn(*argv, "r")) != NULL) {
int r, fd=fileno(f);
r = readahead(fd, 0, fdlength(fd));
diff --git a/miscutils/strings.c b/miscutils/strings.c
index dae17315e..0d5576e9b 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -45,7 +45,7 @@ int strings_main(int argc, char **argv)
}
do {
- file = bb_wfopen(*argv, "r");
+ file = fopen_or_warn(*argv, "r");
if (file) {
PIPE:
count = 0;
@@ -75,7 +75,7 @@ PIPE:
}
count++;
} while (c != EOF);
- bb_fclose_nonstdin(file);
+ fclose_if_not_stdin(file);
} else {
status = EXIT_FAILURE;
}