1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avoid warnings in copy_stream_body.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-04-20 04:12:32 +00:00
parent a16e0c29db
commit f0fbfeda51
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
io.c
View File

@ -6630,7 +6630,7 @@ copy_stream_body(VALUE arg)
{ {
struct copy_stream_struct *stp = (struct copy_stream_struct *)arg; struct copy_stream_struct *stp = (struct copy_stream_struct *)arg;
VALUE src_io, dst_io; VALUE src_io, dst_io;
rb_io_t *src_fptr, *dst_fptr; rb_io_t *src_fptr = 0, *dst_fptr = 0;
int src_fd, dst_fd; int src_fd, dst_fd;
char *src_path = 0, *dst_path = 0; char *src_path = 0, *dst_path = 0;
@ -6652,7 +6652,6 @@ copy_stream_body(VALUE arg)
src_fd = src_fptr->fd; src_fd = src_fptr->fd;
} }
else { else {
src_fptr = 0;
FilePathValue(stp->src); FilePathValue(stp->src);
src_path = StringValueCStr(stp->src); src_path = StringValueCStr(stp->src);
#ifdef O_NOCTTY #ifdef O_NOCTTY
@ -6681,7 +6680,6 @@ copy_stream_body(VALUE arg)
dst_fd = dst_fptr->fd; dst_fd = dst_fptr->fd;
} }
else { else {
dst_fptr = 0;
FilePathValue(stp->dst); FilePathValue(stp->dst);
dst_path = StringValueCStr(stp->dst); dst_path = StringValueCStr(stp->dst);
#ifdef O_NOCTTY #ifdef O_NOCTTY
@ -6695,7 +6693,7 @@ copy_stream_body(VALUE arg)
} }
stp->dst_fd = dst_fd; stp->dst_fd = dst_fd;
if (stp->src_fd == -1 || stp->dst_fd == -1) { if (src_fd == -1 || dst_fd == -1) {
return copy_stream_fallback(stp); return copy_stream_fallback(stp);
} }