diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-07-31 03:53:39 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 11:38:26 -0500 |
| commit | 02eea79624c85fb5ce6c3ffefe2d27e40c5ff97f (patch) | |
| tree | a3fb9be7bfad975ba13651718a011bbad36597ca /source3/registry/reg_objects.c | |
| parent | e23781b3b304d1e69ad80af5ae9c0ed8d02cf996 (diff) | |
| download | samba-02eea79624c85fb5ce6c3ffefe2d27e40c5ff97f.tar.gz samba-02eea79624c85fb5ce6c3ffefe2d27e40c5ff97f.tar.bz2 samba-02eea79624c85fb5ce6c3ffefe2d27e40c5ff97f.zip | |
r17333: Some C++ warnings
(This used to be commit be9aaffdaccae06c8c035eaf31862e34b7cfbe38)
Diffstat (limited to 'source3/registry/reg_objects.c')
| -rw-r--r-- | source3/registry/reg_objects.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source3/registry/reg_objects.c b/source3/registry/reg_objects.c index 33c2660331..2a898f0170 100644 --- a/source3/registry/reg_objects.c +++ b/source3/registry/reg_objects.c @@ -177,7 +177,8 @@ REGISTRY_VALUE* dup_registry_value( REGISTRY_VALUE *val ) if ( val->data_p && val->size ) { - if ( !(copy->data_p = memdup( val->data_p, val->size )) ) { + if ( !(copy->data_p = (uint8 *)memdup( val->data_p, + val->size )) ) { DEBUG(0,("dup_registry_value: memdup() failed for [%d] bytes!\n", val->size)); SAFE_FREE( copy ); @@ -302,7 +303,8 @@ int regval_ctr_addvalue( REGVAL_CTR *ctr, const char *name, uint16 type, fstrcpy( ctr->values[ctr->num_values]->valuename, name ); ctr->values[ctr->num_values]->type = type; - ctr->values[ctr->num_values]->data_p = TALLOC_MEMDUP( ctr, data_p, size ); + ctr->values[ctr->num_values]->data_p = (uint8 *)TALLOC_MEMDUP( + ctr, data_p, size ); ctr->values[ctr->num_values]->size = size; ctr->num_values++; @@ -341,7 +343,8 @@ int regval_ctr_copyvalue( REGVAL_CTR *ctr, REGISTRY_VALUE *val ) fstrcpy( ctr->values[ctr->num_values]->valuename, val->valuename ); ctr->values[ctr->num_values]->type = val->type; - ctr->values[ctr->num_values]->data_p = TALLOC_MEMDUP( ctr, val->data_p, val->size ); + ctr->values[ctr->num_values]->data_p = (uint8 *)TALLOC_MEMDUP( + ctr, val->data_p, val->size ); ctr->values[ctr->num_values]->size = val->size; ctr->num_values++; } |