diff options
| author | Sverker Eriksson <[email protected]> | 2011-12-08 15:14:59 +0100 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2011-12-08 15:14:59 +0100 |
| commit | 18589c852aa7a535bb518cf79a2c510caa830110 (patch) | |
| tree | 8fb09eec1e47c006b8e896c2d0b2d38fdfed43d6 /erts/emulator/test | |
| parent | 6578cd796f4b5c161ed641baded4a6de435325c8 (diff) | |
| parent | ea93ca94a8a73d5e3f27f6a23cdb82870ab66da8 (diff) | |
| download | otp-18589c852aa7a535bb518cf79a2c510caa830110.tar.gz otp-18589c852aa7a535bb518cf79a2c510caa830110.tar.bz2 otp-18589c852aa7a535bb518cf79a2c510caa830110.zip | |
Merge branch 'sverk/misc-valgrind-fixes'
* sverk/misc-valgrind-fixes:
erts: Suppress valgrind warning about syscall sendmsg
erts: Fix memory leak in test drivers
erts: Small fix in inet_drv.c:sctp_set_opts
Diffstat (limited to 'erts/emulator/test')
| -rw-r--r-- | erts/emulator/test/driver_SUITE_data/monitor_drv.c | 3 | ||||
| -rw-r--r-- | erts/emulator/test/driver_SUITE_data/thr_free_drv.c | 2 | ||||
| -rw-r--r-- | erts/emulator/test/driver_SUITE_data/timer_drv.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/erts/emulator/test/driver_SUITE_data/monitor_drv.c b/erts/emulator/test/driver_SUITE_data/monitor_drv.c index 1da6a56a72..ffb6ae9085 100644 --- a/erts/emulator/test/driver_SUITE_data/monitor_drv.c +++ b/erts/emulator/test/driver_SUITE_data/monitor_drv.c @@ -21,6 +21,7 @@ #include "erl_driver.h" static ErlDrvData monitor_drv_start(ErlDrvPort, char *); +static void monitor_drv_stop(ErlDrvData data); static int monitor_drv_control(ErlDrvData, unsigned int, char *, int, char **, int); static void handle_monitor(ErlDrvData drv_data, ErlDrvMonitor *monitor); @@ -50,7 +51,7 @@ typedef struct { static ErlDrvEntry monitor_drv_entry = { NULL /* init */, monitor_drv_start, - NULL /* stop */, + monitor_drv_stop, NULL /* output */, NULL /* ready_input */, NULL /* ready_output */, diff --git a/erts/emulator/test/driver_SUITE_data/thr_free_drv.c b/erts/emulator/test/driver_SUITE_data/thr_free_drv.c index 622a62ebea..40637c946c 100644 --- a/erts/emulator/test/driver_SUITE_data/thr_free_drv.c +++ b/erts/emulator/test/driver_SUITE_data/thr_free_drv.c @@ -175,7 +175,7 @@ fail: driver_free(ttd[t].blocks[b]); } } - + driver_free(td); return ERL_DRV_ERROR_GENERAL; } diff --git a/erts/emulator/test/driver_SUITE_data/timer_drv.c b/erts/emulator/test/driver_SUITE_data/timer_drv.c index b96a95dd4c..3ea37fa079 100644 --- a/erts/emulator/test/driver_SUITE_data/timer_drv.c +++ b/erts/emulator/test/driver_SUITE_data/timer_drv.c @@ -22,7 +22,9 @@ static ErlDrvPort erlang_port; static ErlDrvData timer_start(ErlDrvPort, char*); -static void timer_stop(ErlDrvData), timer_read(ErlDrvData, char*, int), timer(ErlDrvData); +static void timer_stop(ErlDrvData); +static void timer_read(ErlDrvData, char*, int); +static void timer(ErlDrvData); static ErlDrvEntry timer_driver_entry = { |