aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/drivers/common
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2011-11-16 16:04:59 +0100
committerLukas Larsson <[email protected]>2011-12-01 14:10:05 +0100
commitce8fb42d7e92a95666e40614684232d476509cbe (patch)
tree9079ddb4cac9a5cf35d88fb58f91b3965fafa436 /erts/emulator/drivers/common
parenta0d3a833cbd70971aa0c79da9853502e6631524d (diff)
downloadotp-ce8fb42d7e92a95666e40614684232d476509cbe.tar.gz
otp-ce8fb42d7e92a95666e40614684232d476509cbe.tar.bz2
otp-ce8fb42d7e92a95666e40614684232d476509cbe.zip
Change type of fd to be ErlDrvEvent
Diffstat (limited to 'erts/emulator/drivers/common')
-rw-r--r--erts/emulator/drivers/common/efile_drv.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/erts/emulator/drivers/common/efile_drv.c b/erts/emulator/drivers/common/efile_drv.c
index b26e244312..c4f92cc318 100644
--- a/erts/emulator/drivers/common/efile_drv.c
+++ b/erts/emulator/drivers/common/efile_drv.c
@@ -1748,7 +1748,7 @@ static void invoke_sendfile(void *data)
{
struct t_data *d = (struct t_data *)data;
int fd = d->fd;
- int out_fd = d->c.sendfile.out_fd;
+ int out_fd = (int)d->c.sendfile.out_fd;
Uint64 nbytes = d->c.sendfile.nbytes;
int result = 0;
d->again = 0;
@@ -1790,7 +1790,7 @@ static void file_ready_output(ErlDrvData data, ErlDrvEvent event)
switch (fd->d->command) {
case FILE_SENDFILE:
- driver_select(fd->port, (ErlDrvEvent)fd->d->c.sendfile.out_fd,
+ driver_select(fd->port, event,
(int)ERL_DRV_WRITE,(int) 0);
invoke_sendfile((void *)fd->d);
file_async_ready(data, (ErlDrvThreadData)fd->d);
@@ -2232,8 +2232,8 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
SET_NONBLOCKING(d->c.sendfile.out_fd);
free_sendfile(data);
} else {
- driver_select(desc->port, (ErlDrvEvent)d->c.sendfile.out_fd,
- ERL_DRV_USE, 0);
+ driver_select(desc->port, (ErlDrvEvent)(long)d->c.sendfile.out_fd,
+ ERL_DRV_USE, 0);
}
} else if (d->result_ok == 0) {
desc->sendfile_state = not_sending;
@@ -2242,13 +2242,12 @@ file_async_ready(ErlDrvData e, ErlDrvThreadData data)
SET_NONBLOCKING(d->c.sendfile.out_fd);
free_sendfile(data);
} else {
- driver_select(desc->port, (ErlDrvEvent)d->c.sendfile.out_fd,
- ERL_DRV_USE, 0);
+ driver_select(desc->port, (ErlDrvEvent)(long)d->c.sendfile.out_fd, ERL_DRV_USE, 0);
}
} else if (d->result_ok == 1) { // If we are using select to send the rest of the data
desc->sendfile_state = sending;
desc->d = d;
- driver_select(desc->port, (ErlDrvEvent)d->c.sendfile.out_fd,
+ driver_select(desc->port, (ErlDrvEvent)(long)d->c.sendfile.out_fd,
ERL_DRV_USE|ERL_DRV_WRITE, 1);
}
break;