Add prefix, fix read (probably leaks..).

1 files changed, 20 insertions, 19 deletions

diff --git a/libvxi11client/perlbits/Client.xs b/libvxi11client/perlbits/Client.xs
index 65597b9..d8008dd 100644
--- a/libvxi11client/perlbits/Client.xs
+++ b/libvxi11client/perlbits/Client.xs
@@ -13,21 +13,21 @@ MODULE = VXI11::Client		PACKAGE = VXI11::Client
 PROTOTYPES: ENABLE
 
 int
-startinterruptserver()
+vxi_startinterruptserver()
 	CODE:
 		RETVAL = glue_start_interrupt_server(); 
 	OUTPUT:
 		RETVAL
 
 int 
-stopinterruptserver()
+vxi_stopinterruptserver()
         CODE:  
                 RETVAL = glue_stop_interrupt_server();
         OUTPUT:
                 RETVAL
 
 int
-abort(context)
+vxi_abort(context)
 	VXI11::Client context
 	CODE:
 		RETVAL = vxi11_abort(context);
@@ -35,7 +35,7 @@ abort(context)
 		RETVAL
 
 int
-clear(context,waitforlock)
+vxi_clear(context,waitforlock)
 	VXI11::Client context
 	bool	waitforlock
 	CODE:
@@ -44,7 +44,7 @@ clear(context,waitforlock)
 		RETVAL
 
 int
-close(context)
+vxi_close(context)
 	VXI11::Client context
 	CODE:
 		RETVAL = vxi11_close(context);
@@ -52,7 +52,7 @@ close(context)
 		RETVAL
 
 int
-create_intr_chan(context)
+vxi_create_intr_chan(context)
 	VXI11::Client context
 	CODE:
 		RETVAL = vxi11_create_intr_chan(context);
@@ -60,7 +60,7 @@ create_intr_chan(context)
 		RETVAL
 
 int
-destroy_intr_chan(context)
+vxi_destroy_intr_chan(context)
 	VXI11::Client context
 	CODE:
 		RETVAL = vxi11_destroy_intr_chan(context);
@@ -68,7 +68,7 @@ destroy_intr_chan(context)
 		RETVAL
 
 int
-docmd(context, cmd, waitforlock)
+vxi_docmd(context, cmd, waitforlock)
 	VXI11::Client context
 	unsigned long	cmd
 	bool	waitforlock
@@ -78,7 +78,7 @@ docmd(context, cmd, waitforlock)
 		RETVAL
 
 int
-enable_srq(context, enable, handle)
+vxi_enable_srq(context, enable, handle)
 	VXI11::Client context
 	bool	enable
 	char*	handle
@@ -88,7 +88,7 @@ enable_srq(context, enable, handle)
 		RETVAL
 
 char*
-wait_for_interrupt()
+vxi_wait_for_interrupt()
         CODE:
                 RETVAL = glue_wait_for_interrupt();
         OUTPUT:
@@ -96,7 +96,7 @@ wait_for_interrupt()
 
 
 int
-local(context, waitforlock)
+vxi_local(context, waitforlock)
 	VXI11::Client context
 	bool	waitforlock
 	CODE:
@@ -105,7 +105,7 @@ local(context, waitforlock)
 		RETVAL
 
 int
-lock(context, waitforlock)
+vxi_lock(context, waitforlock)
 	VXI11::Client	context
 	bool	waitforlock
 	CODE:
@@ -114,7 +114,7 @@ lock(context, waitforlock)
 		RETVAL
 
 VXI11::Client
-open(address, device)
+vxi_open(address, device)
 	char *	address
 	char *	device
 	CODE:
@@ -123,7 +123,7 @@ open(address, device)
 		RETVAL
 
 void
-read(context, OUTLIST bytesread, OUTLIST buffer, bufferlen, waitlock, termchrset, termchr)
+vxi_read(context, OUTLIST bytesread, OUTLIST buffer, bufferlen, waitlock, termchrset, termchr)
 	VXI11::Client context
 	char *	buffer
 	int 	bytesread
@@ -132,10 +132,11 @@ read(context, OUTLIST bytesread, OUTLIST buffer, bufferlen, waitlock, termchrset
 	bool	termchrset
 	char	termchr
 	CODE:
+		buffer = malloc(bufferlen + 1);
 		bytesread = vxi11_read(context, buffer, bufferlen, waitlock, termchrset, termchr);
 
 int
-readstatusbyte(context, waitforlock)
+vxi_readstatusbyte(context, waitforlock)
 	VXI11::Client context
 	bool	waitforlock
 	CODE:
@@ -144,7 +145,7 @@ readstatusbyte(context, waitforlock)
 		RETVAL
 
 int
-remote(context, waitforlock)
+vxi_remote(context, waitforlock)
 	VXI11::Client context
 	bool	waitforlock
 	CODE:
@@ -153,7 +154,7 @@ remote(context, waitforlock)
 		RETVAL
 
 int
-trigger(context, waitforlock)
+vxi_trigger(context, waitforlock)
 	VXI11::Client context
 	bool	waitforlock
 	CODE:
@@ -162,7 +163,7 @@ trigger(context, waitforlock)
 		RETVAL
 
 int
-unlock(context)
+vxi_unlock(context)
 	VXI11::Client context
 	CODE:
 		RETVAL = vxi11_unlock(context);
@@ -170,7 +171,7 @@ unlock(context)
 		RETVAL
 
 int
-write(context,data, len, waitlock, end)
+vxi_write(context,data, len, waitlock, end)
 	VXI11::Client context
 	char *	data
 	int	len