diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-11-19 18:57:52 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:15:56 -0500 |
| commit | 01367cdfd03d2412904c57807e1ff3c62696d05f (patch) | |
| tree | b887c607396a74e52fe65477b92982407729c995 /source3/librpc/gen_ndr/cli_wkssvc.c | |
| parent | 3372adce58070febd728ee0f941e48d69acc40b4 (diff) | |
| download | samba-01367cdfd03d2412904c57807e1ff3c62696d05f.tar.gz samba-01367cdfd03d2412904c57807e1ff3c62696d05f.tar.bz2 samba-01367cdfd03d2412904c57807e1ff3c62696d05f.zip | |
r19797: Convert the remaining pipes to the "new" unique out ptr handling
(This used to be commit bc4e0a388a2859d2ddcfb8f07920f3b121a37894)
Diffstat (limited to 'source3/librpc/gen_ndr/cli_wkssvc.c')
| -rw-r--r-- | source3/librpc/gen_ndr/cli_wkssvc.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/source3/librpc/gen_ndr/cli_wkssvc.c b/source3/librpc/gen_ndr/cli_wkssvc.c index 918851a15e..04550efbe5 100644 --- a/source3/librpc/gen_ndr/cli_wkssvc.c +++ b/source3/librpc/gen_ndr/cli_wkssvc.c @@ -72,7 +72,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaSetInfo(struct rpc_pipe_client *cli, TALLOC_CTX * return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t level, union WKS_USER_ENUM_UNION *users, uint32_t prefmaxlen, uint32_t *entriesread, uint32_t *totalentries, uint32_t *resumehandle) +NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t level, union WKS_USER_ENUM_UNION *users, uint32_t prefmaxlen, uint32_t **entriesread, uint32_t **totalentries, uint32_t *resumehandle) { struct wkssvc_NetWkstaEnumUsers r; NTSTATUS status; @@ -102,12 +102,8 @@ NTSTATUS rpccli_wkssvc_NetWkstaEnumUsers(struct rpc_pipe_client *cli, TALLOC_CTX /* Return variables */ *users = *r.out.users; - if ( entriesread ) { - *entriesread = *r.out.entriesread; - } - if ( totalentries ) { - *totalentries = *r.out.totalentries; - } + *entriesread = r.out.entriesread; + *totalentries = r.out.totalentries; *resumehandle = *r.out.resumehandle; /* Return result */ @@ -172,7 +168,7 @@ NTSTATUS rpccli_WKSSVC_NETRWKSTAUSERSETINFO(struct rpc_pipe_client *cli, TALLOC_ return werror_to_ntstatus(r.out.result); } -NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t *level, union wkssvc_NetWkstaTransportCtr *ctr, uint32_t max_buffer, uint32_t *totalentries, uint32_t *resume_handle) +NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC_CTX *mem_ctx, const char *server_name, uint32_t *level, union wkssvc_NetWkstaTransportCtr *ctr, uint32_t max_buffer, uint32_t **totalentries, uint32_t *resume_handle) { struct wkssvc_NetWkstaTransportEnum r; NTSTATUS status; @@ -203,9 +199,7 @@ NTSTATUS rpccli_wkssvc_NetWkstaTransportEnum(struct rpc_pipe_client *cli, TALLOC /* Return variables */ *level = *r.out.level; *ctr = *r.out.ctr; - if ( totalentries ) { - *totalentries = *r.out.totalentries; - } + *totalentries = r.out.totalentries; *resume_handle = *r.out.resume_handle; /* Return result */ |