diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-01-16 15:42:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:17:11 -0500 |
| commit | 62e11c4f1748d98f479110c8c0e656a8f65dca4d (patch) | |
| tree | 24dcb7a044c18fe88f7db18540a0062a3da00200 /source3/libmsrpc | |
| parent | 58efeafa7d0e56766a06e75f473cebb420fe18c3 (diff) | |
| download | samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.tar.gz samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.tar.bz2 samba-62e11c4f1748d98f479110c8c0e656a8f65dca4d.zip | |
r20832: Remove extra pointers previously added to unique [out] pointers. Instead,
add [ref] pointers where necessary (top-level [ref] pointers,
by spec, don't appear on the wire).
This brings us closer to the DCE/RPC standard again.
(This used to be commit 580f2a7197b1bc9db14a643fdd112b40ef37aaef)
Diffstat (limited to 'source3/libmsrpc')
| -rw-r--r-- | source3/libmsrpc/cac_winreg.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/source3/libmsrpc/cac_winreg.c b/source3/libmsrpc/cac_winreg.c index 8d131effe5..0bc1f15c33 100644 --- a/source3/libmsrpc/cac_winreg.c +++ b/source3/libmsrpc/cac_winreg.c @@ -338,7 +338,6 @@ int cac_RegCreateKey( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, struct RegOpenKey rok; struct winreg_String key_string, class_string; enum winreg_CreateAction action = 0; - enum winreg_CreateAction *paction = &action; if ( !hnd ) return CAC_FAILURE; @@ -385,7 +384,7 @@ int cac_RegCreateKey( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, rpccli_winreg_CreateKey( pipe_hnd, mem_ctx, op->in.parent_key, key_string, class_string, 0, op->in.access, NULL, key_out, - &paction ); + &action ); if ( !NT_STATUS_IS_OK( hnd->status ) ) { return CAC_FAILURE; @@ -674,12 +673,9 @@ int cac_RegQueryValue( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, REGVAL_BUFFER buffer; REG_VALUE_DATA *data_out = NULL; enum winreg_Type val_type; - enum winreg_Type *pval_type = &val_type; uint8 *buf; uint32 buf_size = 4096; - uint32 *pbuf_size = &buf_size; uint32 length = 0; - uint32 *plength = &length; if ( !hnd ) return CAC_FAILURE; @@ -708,8 +704,8 @@ int cac_RegQueryValue( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, } hnd->status = rpccli_winreg_QueryValue( pipe_hnd, mem_ctx, op->in.key, - value_string, &pval_type, &buf, - &pbuf_size, &plength ); + value_string, &val_type, buf, + &buf_size, &length ); if ( !NT_STATUS_IS_OK( hnd->status ) ) return CAC_FAILURE; @@ -840,11 +836,8 @@ int cac_RegEnumValues( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, do { uint32 data_size = maxvalbufsize; - uint32 *pdata_size = &data_size; uint32 data_length = 0; - uint32 *pdata_length = &data_length; struct winreg_ValNameBuf name_buf; - enum winreg_Type *ptype = &types_out[num_values_out]; memset( name_buffer, 0x0, max_valnamelen ); name_buf.name = name_buffer; @@ -854,9 +847,9 @@ int cac_RegEnumValues( CacServerHandle * hnd, TALLOC_CTX * mem_ctx, hnd->status = rpccli_winreg_EnumValue( pipe_hnd, mem_ctx, op->in.key, resume_idx, &name_buf, - &ptype, &buffer, - &pdata_size, - &pdata_length ); + &types_out[num_values_out], &buffer, + &data_size, + &data_length ); if ( !NT_STATUS_IS_OK( hnd->status ) ) break; |