sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-30 19:42:05 +03:00
Code Activity

Fix some C++ warnings

Browse Source 
(This used to be commit 625241c477)
This commit is contained in:
Volker Lendecke
2008-01-16 20:29:41 +01:00
parent b0950557f9
commit c308d76305
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source3/lib/tdb/common/transaction.c
View File

@ -219,9 +219,12 @@ static int transaction_write(struct tdb_context *tdb, tdb_off_t off,
uint8_t **new_blocks;
/* expand the blocks array */
if (tdb->transaction->blocks == NULL) {
new_blocks = malloc((blk+1)*sizeof(uint8_t *));
new_blocks = (uint8_t **)malloc(
(blk+1)*sizeof(uint8_t *));
} else {
new_blocks = realloc(tdb->transaction->blocks, (blk+1)*sizeof(uint8_t *));
new_blocks = (uint8_t **)realloc(
tdb->transaction->blocks,
(blk+1)*sizeof(uint8_t *));
}
if (new_blocks == NULL) {
tdb->ecode = TDB_ERR_OOM;

4
source3/modules/vfs_shadow_copy2.c
View File

@ -345,7 +345,7 @@ static int shadow_copy2_open(vfs_handle_struct *handle,
static SMB_STRUCT_DIR *shadow_copy2_opendir(vfs_handle_struct *handle,
const char *fname, const char *mask, uint32 attr)
{
SHADOW2_NEXT(OPENDIR, (handle, name, mask, attr), void*, NULL);
SHADOW2_NEXT(OPENDIR, (handle, name, mask, attr), SMB_STRUCT_DIR *, NULL);
}
static int shadow_copy2_stat(vfs_handle_struct *handle,
@ -413,7 +413,7 @@ static int shadow_copy2_mknod(vfs_handle_struct *handle,
static char *shadow_copy2_realpath(vfs_handle_struct *handle,
const char *fname, char *resolved_path)
{
SHADOW2_NEXT(REALPATH, (handle, name, resolved_path), void*, NULL);
SHADOW2_NEXT(REALPATH, (handle, name, resolved_path), char *, NULL);
}
static NTSTATUS shadow_copy2_get_nt_acl(vfs_handle_struct *handle,