[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

On Wed, Aug 29, 2012 at 04:06:02PM +0200, Björn Jacke wrote:
> The branch, master has been updated
>        via  f31d0d0 vfs_media_harmony: fix some compile warnings with llvm
>       from  fb15e5a s3-printing: fix bug 9123 lprng job tracking errors
> 
> http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
> 
> 
> - Log -----------------------------------------------------------------
> commit f31d0d0e30af6577de483ec4e811b9422b8ef39a
> Author: Björn Jacke <bj at sernet.de>
> Date:   Wed Aug 29 13:37:05 2012 +0200
> 
>     vfs_media_harmony: fix some compile warnings with llvm
>     
>     Autobuild-User(master): Björn Jacke <bj at sernet.de>
>     Autobuild-Date(master): Wed Aug 29 16:05:10 CEST 2012 on sn-devel-104
> 
> -----------------------------------------------------------------------
> 
> Summary of changes:
>  source3/modules/vfs_media_harmony.c |  132 +++++++++++++++++-----------------
>  1 files changed, 66 insertions(+), 66 deletions(-)
> 
> 
> Changeset truncated at 500 lines:
> 
> diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
> index e2cb407..53cb176 100644
> --- a/source3/modules/vfs_media_harmony.c
> +++ b/source3/modules/vfs_media_harmony.c
> @@ -430,7 +430,7 @@ static int alloc_get_client_path(vfs_handle_struct *handle,
>  		(*newPath)[pathPtr - path + CREATING_DIRNAME_LEN] = '\0';
>  		DEBUG(MH_INFO_DEBUG, ("newPath #2 %s\n", *newPath));
>  
> -		if (status = alloc_append_client_suffix(handle, newPath))
> +		if ((status = alloc_append_client_suffix(handle, newPath)))

Can you make that into two lines? This form will create
warnings on other compilers.

status = ...
if (status != NULL) {
}

is the one to use according to README.Coding.

Thanks,

Volker

-- 
SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de