From 18b493eb2adf943037c37f99977811de22635e77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Wed, 7 Dec 2011 11:15:58 +0100
Subject: 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.
---
 erts/emulator/test/port_SUITE_data/failure_drv.c | 29 +++++++++++++-----------
 1 file changed, 16 insertions(+), 13 deletions(-)

(limited to 'erts/emulator/test/port_SUITE_data/failure_drv.c')

diff --git a/erts/emulator/test/port_SUITE_data/failure_drv.c b/erts/emulator/test/port_SUITE_data/failure_drv.c
index 34d48e00f8..5826e6d5a9 100644
--- a/erts/emulator/test/port_SUITE_data/failure_drv.c
+++ b/erts/emulator/test/port_SUITE_data/failure_drv.c
@@ -5,10 +5,8 @@ typedef struct _erl_drv_data FailureDrvData;
 
 static FailureDrvData *failure_drv_start(ErlDrvPort, char *);
 static void failure_drv_stop(FailureDrvData *);
-static void failure_drv_output(FailureDrvData *, char *, int);
+static void failure_drv_output(ErlDrvData, char *, ErlDrvSizeT);
 static void failure_drv_finish(void);
-static int failure_drv_control(FailureDrvData *, unsigned int,
-			       char *, int, char **, int);
 
 static ErlDrvEntry failure_drv_entry = { 
     NULL, /* init */
@@ -18,12 +16,22 @@ static ErlDrvEntry failure_drv_entry = {
     NULL, /* ready_input */
     NULL, /* ready_output */
     "failure_drv",
-    failure_drv_finish,
+    NULL, /* finish */
     NULL, /* handle */
-    failure_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,
 };
 
 
@@ -46,7 +54,8 @@ static FailureDrvData *failure_drv_start(ErlDrvPort port, char *command) {
 static void failure_drv_stop(FailureDrvData *data_p) {
 }
 
-static void failure_drv_output(FailureDrvData *data_p, char *buf, int len) {
+static void failure_drv_output(ErlDrvData drv_data, char *buf, ErlDrvSizeT len) {
+    FailureDrvData *data_p = (FailureDrvData *) drv_data;
     void *void_ptr;
     ErlDrvPort port = void_ptr = data_p;
     
@@ -55,9 +64,3 @@ static void failure_drv_output(FailureDrvData *data_p, char *buf, int len) {
 
 static void failure_drv_finish() {
 }
-
-static int failure_drv_control(FailureDrvData *data_p, unsigned int command,
-			       char *buf, int len,
-			       char **rbuf, int rlen) {
-    return 0;
-}
-- 
cgit v1.2.3