From 7527c022a16d70f0813bd926766c37d4120a5cb9 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 2 Nov 2010 14:40:52 -0400 Subject: [PATCH] making upcall_marshal void --- daemon/nfs41_daemon.c | 2 +- daemon/upcall.c | 3 +-- daemon/upcall.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/daemon/nfs41_daemon.c b/daemon/nfs41_daemon.c index 561f638..3877830 100644 --- a/daemon/nfs41_daemon.c +++ b/daemon/nfs41_daemon.c @@ -116,7 +116,7 @@ write_downcall: inbuf_len = UPCALL_BUF_SIZE; inbuf = malloc(inbuf_len); - status = upcall_marshall(&upcall, inbuf, (uint32_t)inbuf_len, (uint32_t*)&outbuf_len); + upcall_marshall(&upcall, inbuf, (uint32_t)inbuf_len, (uint32_t*)&outbuf_len); dprintf(2, "making a downcall: outbuf_len %ld\n\n", outbuf_len); status = DeviceIoControl(pipe, IOCTL_NFS41_WRITE, diff --git a/daemon/upcall.c b/daemon/upcall.c index 9823b60..fdbb1ab 100644 --- a/daemon/upcall.c +++ b/daemon/upcall.c @@ -130,7 +130,7 @@ out: return status; } -int upcall_marshall( +void upcall_marshall( IN nfs41_upcall *upcall, OUT unsigned char *buffer, IN uint32_t length, @@ -164,7 +164,6 @@ write_downcall: } out: *length_out = total - length; - return status; } void upcall_cancel( diff --git a/daemon/upcall.h b/daemon/upcall.h index c05dfa2..ba9f2c4 100644 --- a/daemon/upcall.h +++ b/daemon/upcall.h @@ -210,7 +210,7 @@ int upcall_parse( int upcall_handle( IN nfs41_upcall *upcall); -int upcall_marshall( +void upcall_marshall( IN nfs41_upcall *upcall, OUT unsigned char *buffer, IN uint32_t length,