diff options
| author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:25:17 +0000 |
|---|---|---|
| committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:25:17 +0000 |
| commit | 467f463615e7329b267abea02da9ed9cedd2382b (patch) | |
| tree | f4f2aa58fa669aed6e2c50bb7aa648a79ec1873d /miscutils | |
| parent | 6dc3a21627db11fa0f374afe29a6bbf4f89c8b64 (diff) | |
| download | busybox-w32-467f463615e7329b267abea02da9ed9cedd2382b.tar.gz busybox-w32-467f463615e7329b267abea02da9ed9cedd2382b.tar.bz2 busybox-w32-467f463615e7329b267abea02da9ed9cedd2382b.zip | |
rename functions to more understandable names
git-svn-id: svn://busybox.net/trunk/busybox@16447 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'miscutils')
| -rw-r--r-- | miscutils/readahead.c | 2 | ||||
| -rw-r--r-- | miscutils/strings.c | 4 |
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) | |||
| 20 | if (argc == 1) bb_show_usage(); | 20 | if (argc == 1) bb_show_usage(); |
| 21 | 21 | ||
| 22 | while (*++argv) { | 22 | while (*++argv) { |
| 23 | if ((f = bb_wfopen(*argv, "r")) != NULL) { | 23 | if ((f = fopen_or_warn(*argv, "r")) != NULL) { |
| 24 | int r, fd=fileno(f); | 24 | int r, fd=fileno(f); |
| 25 | 25 | ||
| 26 | r = readahead(fd, 0, fdlength(fd)); | 26 | 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) | |||
| 45 | } | 45 | } |
| 46 | 46 | ||
| 47 | do { | 47 | do { |
| 48 | file = bb_wfopen(*argv, "r"); | 48 | file = fopen_or_warn(*argv, "r"); |
| 49 | if (file) { | 49 | if (file) { |
| 50 | PIPE: | 50 | PIPE: |
| 51 | count = 0; | 51 | count = 0; |
| @@ -75,7 +75,7 @@ PIPE: | |||
| 75 | } | 75 | } |
| 76 | count++; | 76 | count++; |
| 77 | } while (c != EOF); | 77 | } while (c != EOF); |
| 78 | bb_fclose_nonstdin(file); | 78 | fclose_if_not_stdin(file); |
| 79 | } else { | 79 | } else { |
| 80 | status = EXIT_FAILURE; | 80 | status = EXIT_FAILURE; |
| 81 | } | 81 | } |