diff options
author | Björn Gustavsson <bjorn@erlang.org> | 2011-12-07 11:15:58 +0100 |
---|---|---|
committer | Björn Gustavsson <bjorn@erlang.org> | 2011-12-09 11:46:27 +0100 |
commit | 491002b27665158a6d7a7b5a1c7bc242a45380b4 (patch) | |
tree | 34ab6b33270c89d688ce69b8adcd2e05ed3d8668 /erts | |
parent | 48b5c437a6aef156d59298de90e69c9babfcf73d (diff) | |
download | otp-491002b27665158a6d7a7b5a1c7bc242a45380b4.tar.gz otp-491002b27665158a6d7a7b5a1c7bc242a45380b4.tar.bz2 otp-491002b27665158a6d7a7b5a1c7bc242a45380b4.zip |
system_profile_SUITE_data/echo_drv.c: Conform to updated driver API
While at it, also eliminate all compiler warnings. Also remove
the control callback since it is not actually used.
Diffstat (limited to 'erts')
-rw-r--r-- | erts/emulator/test/system_profile_SUITE_data/echo_drv.c | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/erts/emulator/test/system_profile_SUITE_data/echo_drv.c b/erts/emulator/test/system_profile_SUITE_data/echo_drv.c index d968ff06f9..e0b6ff804c 100644 --- a/erts/emulator/test/system_profile_SUITE_data/echo_drv.c +++ b/erts/emulator/test/system_profile_SUITE_data/echo_drv.c @@ -9,11 +9,9 @@ static EchoDrvData echo_drv_data, *echo_drv_data_p; static EchoDrvData *echo_drv_start(ErlDrvPort port, char *command); static void echo_drv_stop(EchoDrvData *data_p); -static void echo_drv_output(EchoDrvData *data_p, char *buf, int len); +static void echo_drv_output(ErlDrvData drv_data, char *buf, + ErlDrvSizeT len); static void echo_drv_finish(void); -static int echo_drv_control(EchoDrvData *data_p, unsigned int command, - char *buf, int len, - char **rbuf, int rlen); static ErlDrvEntry echo_drv_entry = { NULL, /* init */ @@ -25,10 +23,21 @@ static ErlDrvEntry echo_drv_entry = { "echo_drv", echo_drv_finish, NULL, /* handle */ - echo_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(echo_drv) @@ -51,16 +60,11 @@ static void echo_drv_stop(EchoDrvData *data_p) { echo_drv_data_p = NULL; } -static void echo_drv_output(EchoDrvData *data_p, char *buf, int len) { +static void echo_drv_output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len) { + EchoDrvData* data_p = (EchoDrvData *) drv_data; driver_output(data_p->erlang_port, buf, len); } static void echo_drv_finish() { echo_drv_data_p = NULL; } - -static int echo_drv_control(EchoDrvData *data_p, unsigned int command, - char *buf, int len, - char **rbuf, int rlen) { - return 0; -} |