[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  da4057f vfs_media_harmony: fix return of void
      from  c301691 s3:smb2_server: fix SMB2 signing of compound responses

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


- Log -----------------------------------------------------------------
commit da4057fdca67571492b2cfc6329686e19696e4a0
Author: Björn Jacke <b...@sernet.de>
Date:   Tue Aug 7 19:16:40 2012 +0200

    vfs_media_harmony: fix return of void
    
    caught by the Studio Compiler
    
    Autobuild-User(master): Björn Jacke <b...@sernet.de>
    Autobuild-Date(master): Tue Aug  7 22:22:48 CEST 2012 on sn-devel-104

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

Summary of changes:
 source3/modules/vfs_media_harmony.c |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_media_harmony.c 
b/source3/modules/vfs_media_harmony.c
index 82beccc..0bc14d9 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -997,8 +997,9 @@ static void mh_seekdir(vfs_handle_struct *handle,
                long offset)
 {
        DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_seekdir\n"));
-       return SMB_VFS_NEXT_SEEKDIR(handle,
+       SMB_VFS_NEXT_SEEKDIR(handle,
                        ((mh_dirinfo_struct*)dirp)->dirstream, offset);
+       return;
 }
 
 /*
@@ -1021,8 +1022,9 @@ static void mh_rewinddir(vfs_handle_struct *handle,
                DIR *dirp)
 {
        DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_rewinddir\n"));
-       return SMB_VFS_NEXT_REWINDDIR(handle,
+       SMB_VFS_NEXT_REWINDDIR(handle,
                        ((mh_dirinfo_struct*)dirp)->dirstream);
+       return;
 }
 
 /*
@@ -1120,8 +1122,9 @@ static void mh_init_search_op(vfs_handle_struct *handle,
                DIR *dirp)
 {
        DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_init_search_op\n"));
-       return SMB_VFS_NEXT_INIT_SEARCH_OP(handle,
+       SMB_VFS_NEXT_INIT_SEARCH_OP(handle,
                        ((mh_dirinfo_struct*)dirp)->dirstream);
+       return;
 }
 
 /*


-- 
Samba Shared Repository