summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2008-01-16 20:29:41 +0100
committerVolker Lendecke <vl@samba.org>2008-01-16 20:29:41 +0100
commitc308d76305d0a598ce03c516ff0c3b3a8875c89c (patch)
tree1f3adc7fadd2a5a26effaf45a5954f383def0e94 /source3
parentb0950557f90129b5cd51faf74dbf5d58a8f4d6b9 (diff)
downloadsamba-c308d76305d0a598ce03c516ff0c3b3a8875c89c.tar.gz
samba-c308d76305d0a598ce03c516ff0c3b3a8875c89c.tar.bz2
samba-c308d76305d0a598ce03c516ff0c3b3a8875c89c.zip
Fix some C++ warnings
(This used to be commit 625241c4773ae5c80dd0cb0c07a86aff633c1ede)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/tdb/common/transaction.c7
-rw-r--r--source3/modules/vfs_shadow_copy2.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/lib/tdb/common/transaction.c b/source3/lib/tdb/common/transaction.c
index ea0e3a93f3..c3e7a4e2c0 100644
--- a/source3/lib/tdb/common/transaction.c
+++ b/source3/lib/tdb/common/transaction.c
@@ -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;
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index 54fc672b9c..ddbc5aab18 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -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,