diff options
| author | Günther Deschner <gd@samba.org> | 2009-09-23 20:46:08 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-09-30 00:29:49 +0200 |
| commit | 2c11b73391551723e4ada8664b1ba77873420217 (patch) | |
| tree | 9cd85bb729c6aa7e2801ebbcd9acbed39f7e8054 /source3/registry/reg_perfcount.c | |
| parent | fcee9d2c97a673347baf58f749f35785a896e468 (diff) | |
| download | samba-2c11b73391551723e4ada8664b1ba77873420217.tar.gz samba-2c11b73391551723e4ada8664b1ba77873420217.tar.bz2 samba-2c11b73391551723e4ada8664b1ba77873420217.zip | |
s3-registry: use push_reg_sz().
Guenther
Diffstat (limited to 'source3/registry/reg_perfcount.c')
| -rw-r--r-- | source3/registry/reg_perfcount.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/registry/reg_perfcount.c b/source3/registry/reg_perfcount.c index 14716b2f53..ea4ccbf58f 100644 --- a/source3/registry/reg_perfcount.c +++ b/source3/registry/reg_perfcount.c @@ -161,7 +161,7 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb, char temp[256]; char *buf1 = *retbuf; uint32 working_size = 0; - UNISTR2 name_index, name; + DATA_BLOB name_index, name; memset(temp, 0, sizeof(temp)); snprintf(temp, sizeof(temp), "%d", keyval); @@ -182,8 +182,8 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb, buffer_size = 0; return buffer_size; } - init_unistr2(&name_index, (const char *)kbuf.dptr, UNI_STR_TERMINATE); - memcpy(buf1+buffer_size, (char *)name_index.buffer, working_size); + push_reg_sz(talloc_tos(), &name_index, (const char *)kbuf.dptr); + memcpy(buf1+buffer_size, (char *)name_index.data, working_size); buffer_size += working_size; /* Now encode the actual name */ working_size = (dbuf.dsize + 1)*sizeof(uint16); @@ -195,8 +195,8 @@ static uint32 _reg_perfcount_multi_sz_from_tdb(TDB_CONTEXT *tdb, memset(temp, 0, sizeof(temp)); memcpy(temp, dbuf.dptr, dbuf.dsize); SAFE_FREE(dbuf.dptr); - init_unistr2(&name, temp, UNI_STR_TERMINATE); - memcpy(buf1+buffer_size, (char *)name.buffer, working_size); + push_reg_sz(talloc_tos(), &name, temp); + memcpy(buf1+buffer_size, (char *)name.data, working_size); buffer_size += working_size; *retbuf = buf1; |