diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
|---|---|---|
| committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2011-01-04 19:56:11 +0700 |
| commit | 9db69882bee2d528d706d61d34ef7741122330be (patch) | |
| tree | f46c4ed5cae58956cd165e552ea4e366fd9b1a6c /libbb/wfopen_input.c | |
| parent | 3f357a9c754805c4c38793749927aeda82797735 (diff) | |
| parent | e4dcba1c103dc28e927e004791e331aaf604383d (diff) | |
| download | busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.gz busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.tar.bz2 busybox-w32-9db69882bee2d528d706d61d34ef7741122330be.zip | |
Merge commit 'e4dcba1c103dc28e927e004791e331aaf604383d'
Conflicts:
libbb/make_directory.c
Diffstat (limited to 'libbb/wfopen_input.c')
| -rw-r--r-- | libbb/wfopen_input.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libbb/wfopen_input.c b/libbb/wfopen_input.c index 422a58ecf..d8b1c4a36 100644 --- a/libbb/wfopen_input.c +++ b/libbb/wfopen_input.c | |||
| @@ -31,7 +31,7 @@ FILE* FAST_FUNC xfopen_stdin(const char *filename) | |||
| 31 | FILE *fp = fopen_or_warn_stdin(filename); | 31 | FILE *fp = fopen_or_warn_stdin(filename); |
| 32 | if (fp) | 32 | if (fp) |
| 33 | return fp; | 33 | return fp; |
| 34 | xfunc_die(); /* We already output an error message. */ | 34 | xfunc_die(); /* We already output an error message. */ |
| 35 | } | 35 | } |
| 36 | 36 | ||
| 37 | int FAST_FUNC open_or_warn_stdin(const char *filename) | 37 | int FAST_FUNC open_or_warn_stdin(const char *filename) |
| @@ -52,5 +52,5 @@ int FAST_FUNC xopen_stdin(const char *filename) | |||
| 52 | int fd = open_or_warn_stdin(filename); | 52 | int fd = open_or_warn_stdin(filename); |
| 53 | if (fd >= 0) | 53 | if (fd >= 0) |
| 54 | return fd; | 54 | return fd; |
| 55 | xfunc_die(); /* We already output an error message. */ | 55 | xfunc_die(); /* We already output an error message. */ |
| 56 | } | 56 | } |