From ddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0 Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Thu, 26 Oct 2006 23:25:17 +0000 Subject: rename functions to more understandable names --- miscutils/readahead.c | 2 +- miscutils/strings.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'miscutils') 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; } -- cgit v1.2.3