diff options
author | Jeremy Allison <jra@samba.org> | 2007-04-27 23:18:41 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:19:44 -0500 |
commit | 12ba88574bf91bdcc4447bfc3d429b799064bfd9 (patch) | |
tree | 17f9b68292eb277da8c71871f8cad332c43d3a5a /source3/libmsrpc/libmsrpc_internal.c | |
parent | fdc0b87083496ae9d6d9d3d1d1a71dddaca24da2 (diff) | |
download | samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.gz samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.tar.bz2 samba-12ba88574bf91bdcc4447bfc3d429b799064bfd9.zip |
r22542: Move over to using the _strict varients of the talloc
calls. No functional changes. Looks bigger than it is :-).
Jeremy.
(This used to be commit f6fa3080fee1b20df9f1968500840a88cf0ee592)
Diffstat (limited to 'source3/libmsrpc/libmsrpc_internal.c')
-rw-r--r-- | source3/libmsrpc/libmsrpc_internal.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/libmsrpc/libmsrpc_internal.c b/source3/libmsrpc/libmsrpc_internal.c index b9eb5a40e9..a86cde178d 100644 --- a/source3/libmsrpc/libmsrpc_internal.c +++ b/source3/libmsrpc/libmsrpc_internal.c @@ -200,7 +200,7 @@ char *cac_unistr_to_str( TALLOC_CTX * mem_ctx, uint16 * src, int num_bytes ) /*need room for a '\0' */ str_len++; - buf = talloc_array( mem_ctx, char, str_len ); + buf = TALLOC_ARRAY( mem_ctx, char, str_len ); if ( !buf ) { return NULL; @@ -265,7 +265,7 @@ REG_VALUE_DATA *cac_MakeRegValueData( TALLOC_CTX * mem_ctx, uint32 data_type, data->reg_binary.data_length = size; data->reg_binary.data = - ( uint8 * ) talloc_memdup( mem_ctx, buf.buffer, + ( uint8 * ) TALLOC_MEMDUP( mem_ctx, buf.buffer, size ); if ( !data->reg_binary.data ) { TALLOC_FREE( data ); @@ -296,7 +296,7 @@ REG_VALUE_DATA *cac_MakeRegValueData( TALLOC_CTX * mem_ctx, uint32 data_type, break; } - strings = talloc_array( mem_ctx, char *, num_strings ); + strings = TALLOC_ARRAY( mem_ctx, char *, num_strings ); if ( !strings ) { errno = ENOMEM; @@ -424,7 +424,7 @@ char *talloc_unistr2_to_ascii( TALLOC_CTX * mem_ctx, UNISTR2 str ) if ( !mem_ctx ) return NULL; - buf = talloc_array( mem_ctx, char, ( str.uni_str_len + 1 ) ); + buf = TALLOC_ARRAY( mem_ctx, char, ( str.uni_str_len + 1 ) ); if ( !buf ) return NULL; @@ -514,7 +514,7 @@ CacUserInfo *cac_MakeUserInfo( TALLOC_CTX * mem_ctx, SAM_USERINFO_CTR * ctr ) memcpy( info->lm_password, id21->lm_pwd, 8 ); info->logon_hours = - ( LOGON_HRS * ) talloc_memdup( mem_ctx, &( id21->logon_hrs ), + ( LOGON_HRS * ) TALLOC_MEMDUP( mem_ctx, &( id21->logon_hrs ), sizeof( LOGON_HRS ) ); if ( !info->logon_hours ) return NULL; |