sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r19777: Make regsubkey_ctr_addkey return WERROR. Nobody checks this so far, but this

Browse Source 
will change.

Volker
(This used to be commit 17c7c337f6)
This commit is contained in:
Volker Lendecke 2006-11-18 17:46:32 +00:00 committed by Gerald (Jerry) Carter
parent 09ec562a09
commit cbc03ec6df
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
source3/registry/reg_objects.c
View File

@ -41,35 +41,37 @@
Add a new key to the array
**********************************************************************/
int regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname )
WERROR regsubkey_ctr_addkey( REGSUBKEY_CTR *ctr, const char *keyname )
{
if ( !keyname )
return ctr->num_subkeys;
char **newkeys;
if ( !keyname ) {
return WERR_OK;
}
/* make sure the keyname is not already there */
if ( regsubkey_ctr_key_exists( ctr, keyname ) )
return ctr->num_subkeys;
/* allocate a space for the char* in the array */
if (ctr->subkeys == NULL) {
ctr->subkeys = TALLOC_P(ctr, char *);
} else {
ctr->subkeys = TALLOC_REALLOC_ARRAY(ctr, ctr->subkeys, char *, ctr->num_subkeys+1);
if ( regsubkey_ctr_key_exists( ctr, keyname ) ) {
return WERR_OK;
}
if (!ctr->subkeys) {
ctr->num_subkeys = 0;
return 0;
if (!(newkeys = TALLOC_REALLOC_ARRAY(ctr, ctr->subkeys, char *,
ctr->num_subkeys+1))) {
return WERR_NOMEM;
}
/* allocate the string and save it in the array */
ctr->subkeys[ctr->num_subkeys] = talloc_strdup( ctr, keyname );
ctr->subkeys = newkeys;
if (!(ctr->subkeys[ctr->num_subkeys] = talloc_strdup(ctr->subkeys,
keyname ))) {
/*
* Don't shrink the new array again, this wastes a pointer
*/
return WERR_NOMEM;
}
ctr->num_subkeys++;
return ctr->num_subkeys;
return WERR_OK;
}
/***********************************************************************