[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-test-1438-gdcb7fb2

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  dcb7fb2c0d8e4b798b36e8caf480d198f3e08d00 (commit)
       via  625241c4773ae5c80dd0cb0c07a86aff633c1ede (commit)
       via  871cee04f26da97756804b38acfd366b6011dc9e (commit)
      from  05c22a55a4c052c682a2f2afdb0696504195d18c (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit dcb7fb2c0d8e4b798b36e8caf480d198f3e08d00
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 16 20:31:02 2008 +0100

    Fix an uninitialized variable warning

commit 625241c4773ae5c80dd0cb0c07a86aff633c1ede
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 16 20:29:41 2008 +0100

    Fix some C++ warnings

commit 871cee04f26da97756804b38acfd366b6011dc9e
Author: Volker Lendecke <vl at samba.org>
Date:   Wed Jan 16 20:25:57 2008 +0100

    Fix a missing prototype warning

-----------------------------------------------------------------------

Summary of changes:
 source/lib/tdb/common/tdb_private.h |    1 +
 source/lib/tdb/common/transaction.c |    7 +++++--
 source/modules/vfs_shadow_copy2.c   |    4 ++--
 source/modules/vfs_xattr_tdb.c      |    2 +-
 4 files changed, 9 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/tdb/common/tdb_private.h b/source/lib/tdb/common/tdb_private.h
index 63a6d04..dd69903 100644
--- a/source/lib/tdb/common/tdb_private.h
+++ b/source/lib/tdb/common/tdb_private.h
@@ -178,6 +178,7 @@ struct tdb_context {
 int tdb_munmap(struct tdb_context *tdb);
 void tdb_mmap(struct tdb_context *tdb);
 int tdb_lock(struct tdb_context *tdb, int list, int ltype);
+int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype);
 int tdb_unlock(struct tdb_context *tdb, int list, int ltype);
 int tdb_brlock(struct tdb_context *tdb, tdb_off_t offset, int rw_type, int lck_type, int probe, size_t len);
 int tdb_transaction_lock(struct tdb_context *tdb, int ltype);
diff --git a/source/lib/tdb/common/transaction.c b/source/lib/tdb/common/transaction.c
index ea0e3a9..c3e7a4e 100644
--- a/source/lib/tdb/common/transaction.c
+++ b/source/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/source/modules/vfs_shadow_copy2.c b/source/modules/vfs_shadow_copy2.c
index 54fc672..ddbc5aa 100644
--- a/source/modules/vfs_shadow_copy2.c
+++ b/source/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,
diff --git a/source/modules/vfs_xattr_tdb.c b/source/modules/vfs_xattr_tdb.c
index 3a72831..29864a8 100644
--- a/source/modules/vfs_xattr_tdb.c
+++ b/source/modules/vfs_xattr_tdb.c
@@ -134,7 +134,7 @@ static struct db_record *xattr_tdb_lock_attrs(TALLOC_CTX *mem_ctx,
 static NTSTATUS xattr_tdb_save_attrs(struct db_record *rec,
 				     const struct tdb_xattrs *attribs)
 {
-	TDB_DATA data;
+	TDB_DATA data = tdb_null;
 	NTSTATUS status;
 
 	status = xattr_tdb_push_attrs(talloc_tos(), attribs, &data);


-- 
Samba Shared Repository