[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  94a97bf talloc: fix compiler warnings with -Wc++-compat
      from  6a77b52 s3: Fix Coverity ID 2470: STRAY_SEMICOLON

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 94a97bf64cadf39b488158cc379aa0eeb10dbd88
Author: Stefan Metzmacher <metze at samba.org>
Date:   Wed Apr 13 13:40:29 2011 +0200

    talloc: fix compiler warnings with -Wc++-compat
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Wed Apr 13 14:33:23 CEST 2011 on sn-devel-104

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

Summary of changes:
 lib/talloc/talloc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.c b/lib/talloc/talloc.c
index 6f952dc..91452bf 100644
--- a/lib/talloc/talloc.c
+++ b/lib/talloc/talloc.c
@@ -131,7 +131,7 @@ static struct {
 #define TC_INVALIDATE_FULL_FILL_CHUNK(_tc) do { \
 	if (unlikely(talloc_fill.enabled)) { \
 		size_t _flen = (_tc)->size; \
-		char *_fptr = TC_PTR_FROM_CHUNK(_tc); \
+		char *_fptr = (char *)TC_PTR_FROM_CHUNK(_tc); \
 		memset(_fptr, talloc_fill.fill_value, _flen); \
 	} \
 } while (0)
@@ -155,7 +155,7 @@ static struct {
 #define TC_INVALIDATE_SHRINK_FILL_CHUNK(_tc, _new_size) do { \
 	if (unlikely(talloc_fill.enabled)) { \
 		size_t _flen = (_tc)->size - (_new_size); \
-		char *_fptr = TC_PTR_FROM_CHUNK(_tc); \
+		char *_fptr = (char *)TC_PTR_FROM_CHUNK(_tc); \
 		_fptr += (_new_size); \
 		memset(_fptr, talloc_fill.fill_value, _flen); \
 	} \
@@ -165,7 +165,7 @@ static struct {
 /* Mark the unused bytes not accessable */
 #define TC_INVALIDATE_SHRINK_VALGRIND_CHUNK(_tc, _new_size) do { \
 	size_t _flen = (_tc)->size - (_new_size); \
-	char *_fptr = TC_PTR_FROM_CHUNK(_tc); \
+	char *_fptr = (char *)TC_PTR_FROM_CHUNK(_tc); \
 	_fptr += (_new_size); \
 	VALGRIND_MAKE_MEM_NOACCESS(_fptr, _flen); \
 } while (0)
@@ -430,7 +430,7 @@ _PUBLIC_ const char *talloc_parent_name(const void *ptr)
 #define TC_INVALIDATE_FILL_POOL(_pool_tc) do { \
 	if (unlikely(talloc_fill.enabled)) { \
 		size_t _flen = TC_POOL_SPACE_LEFT(_pool_tc); \
-		char *_fptr = (_pool_tc)->pool; \
+		char *_fptr = (char *)(_pool_tc)->pool; \
 		memset(_fptr, talloc_fill.fill_value, _flen); \
 	} \
 } while(0)
@@ -439,7 +439,7 @@ _PUBLIC_ const char *talloc_parent_name(const void *ptr)
 /* Mark the whole remaining pool as not accessable */
 #define TC_INVALIDATE_VALGRIND_POOL(_pool_tc) do { \
 	size_t _flen = TC_POOL_SPACE_LEFT(_pool_tc); \
-	char *_fptr = (_pool_tc)->pool; \
+	char *_fptr = (char *)(_pool_tc)->pool; \
 	VALGRIND_MAKE_MEM_NOACCESS(_fptr, _flen); \
 } while(0)
 #else


-- 
Samba Shared Repository