aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/test/port_SUITE_data/exit_drv.c
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2011-12-07 11:15:58 +0100
committerBjörn Gustavsson <[email protected]>2011-12-09 11:46:28 +0100
commit18b493eb2adf943037c37f99977811de22635e77 (patch)
treefac2657783d99954c9f0b64eae12c9861c65e8e7 /erts/emulator/test/port_SUITE_data/exit_drv.c
parentbe84eaa111299aa575cde2c2bb9f88fb11274025 (diff)
downloadotp-18b493eb2adf943037c37f99977811de22635e77.tar.gz
otp-18b493eb2adf943037c37f99977811de22635e77.tar.bz2
otp-18b493eb2adf943037c37f99977811de22635e77.zip
port_SUITE_data/*_drv.c: Conform to updated driver API
While at it, eliminate compilation warnings. Eliminate the control callback if it is not used.
Diffstat (limited to 'erts/emulator/test/port_SUITE_data/exit_drv.c')
-rw-r--r--erts/emulator/test/port_SUITE_data/exit_drv.c33
1 files changed, 15 insertions, 18 deletions
diff --git a/erts/emulator/test/port_SUITE_data/exit_drv.c b/erts/emulator/test/port_SUITE_data/exit_drv.c
index 60f1b321bd..5f366b3545 100644
--- a/erts/emulator/test/port_SUITE_data/exit_drv.c
+++ b/erts/emulator/test/port_SUITE_data/exit_drv.c
@@ -5,11 +5,9 @@ typedef struct _erl_drv_data ExitDrvData;
static ExitDrvData *exit_drv_start(ErlDrvPort port, char *command);
static void exit_drv_stop(ExitDrvData *data_p);
-static void exit_drv_output(ExitDrvData *data_p, char *buf, int len);
+static void exit_drv_output(ExitDrvData *data_p, char *buf,
+ ErlDrvSizeT len);
static void exit_drv_finish(void);
-static int exit_drv_control(ExitDrvData *data_p, unsigned int command,
- char *buf, int len,
- char **rbuf, int rlen);
static ErlDrvEntry exit_drv_entry = {
NULL, /* init */
@@ -21,10 +19,20 @@ static ErlDrvEntry exit_drv_entry = {
"exit_drv",
exit_drv_finish,
NULL, /* handle */
- exit_drv_control,
+ NULL, /* control */
NULL, /* timeout */
NULL, /* outputv */
- NULL /* ready_async */
+ NULL, /* ready_async */
+ NULL,
+ NULL,
+ NULL,
+ ERL_DRV_EXTENDED_MARKER,
+ ERL_DRV_EXTENDED_MAJOR_VERSION,
+ ERL_DRV_EXTENDED_MINOR_VERSION,
+ 0,
+ NULL,
+ NULL,
+ NULL,
};
DRIVER_INIT(exit_drv)
@@ -45,7 +53,7 @@ exit_drv_stop(ExitDrvData *datap)
}
static void
-exit_drv_output(ExitDrvData *datap, char *buf, int len)
+exit_drv_output(ExitDrvData *datap, char *buf, ErlDrvSizeT len)
{
driver_exit((ErlDrvPort) datap, 0);
}
@@ -55,14 +63,3 @@ exit_drv_finish(void)
{
}
-
-static int
-exit_drv_control(ExitDrvData *datap,
- unsigned int command,
- char *buf,
- int len,
- char **rbuf,
- int rlen)
-{
- return 0;
-}