[SCM] Samba Shared Repository - branch master updated
Björn Jacke
bjacke at samba.org
Tue Aug 7 18:18:02 MDT 2012
The branch, master has been updated
via c2dee12 vfs_dirsort: Remove unnecessary return; statement
via 375ba1b vfs_afsacl.c: Remove some unnecessary return; statements
via ebc92d0 vfs_full_audit: Remove some unnecessary return; statements
via dab8fe5 vfs_time_audit: Remove unnecessary return; statement
via 3f9b2cc vfs_time_audit: Remove some unnecessary return; statements
via 9adf6a0 vfs-mediaharmony: Remove some unnecessary return; statements
from da4057f vfs_media_harmony: fix return of void
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c2dee12d678234126648d150f6f03165a2b7c95b
Author: Björn Jacke <bj at sernet.de>
Date: Wed Aug 8 00:19:00 2012 +0200
vfs_dirsort: Remove unnecessary return; statement
Autobuild-User(master): Björn Jacke <bj at sernet.de>
Autobuild-Date(master): Wed Aug 8 02:17:13 CEST 2012 on sn-devel-104
commit 375ba1b483c5a1861df7a897020397f87575a8f9
Author: Björn Jacke <bj at sernet.de>
Date: Wed Aug 8 00:15:29 2012 +0200
vfs_afsacl.c: Remove some unnecessary return; statements
commit ebc92d071567b7e7ca8b06372aeccaf26a986b3c
Author: Björn Jacke <bj at sernet.de>
Date: Wed Aug 8 00:14:46 2012 +0200
vfs_full_audit: Remove some unnecessary return; statements
commit dab8fe5deabd3feec7451163e8569ee665567f18
Author: Björn Jacke <bj at sernet.de>
Date: Wed Aug 8 00:13:10 2012 +0200
vfs_time_audit: Remove unnecessary return; statement
commit 3f9b2cc6828e431d2340ee3d7b4411c363ca11b1
Author: Björn Jacke <bj at sernet.de>
Date: Wed Aug 8 00:12:00 2012 +0200
vfs_time_audit: Remove some unnecessary return; statements
commit 9adf6a061a3d47ea2b7cadb6508dd5acffdbb8bd
Author: Volker Lendecke <vl at samba.org>
Date: Tue Aug 7 22:42:02 2012 +0200
vfs-mediaharmony: Remove some unnecessary return; statements
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_afsacl.c | 5 -----
source3/modules/vfs_dirsort.c | 2 --
source3/modules/vfs_full_audit.c | 9 ---------
source3/modules/vfs_media_harmony.c | 3 ---
source3/modules/vfs_shadow_copy2.c | 2 --
source3/modules/vfs_time_audit.c | 7 -------
6 files changed, 0 insertions(+), 28 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_afsacl.c b/source3/modules/vfs_afsacl.c
index 61a3145..ab7ef30 100644
--- a/source3/modules/vfs_afsacl.c
+++ b/source3/modules/vfs_afsacl.c
@@ -217,8 +217,6 @@ static void add_afs_ace(struct afs_acl *acl,
DEBUG(10, ("add_afs_ace: Added %s entry for %s with rights %d\n",
ace->positive?"positive":"negative",
ace->name, ace->rights));
-
- return;
}
/* AFS ACLs in string form are a long string of fields delimited with \n.
@@ -395,8 +393,6 @@ static void afs_to_nt_dir_rights(uint32 afs_rights, uint32 *nt_rights,
/* Only lookup right */
*flag = SEC_ACE_FLAG_CONTAINER_INHERIT;
}
-
- return;
}
#define AFS_FILE_RIGHTS (PRSFS_READ|PRSFS_WRITE|PRSFS_LOCK)
@@ -422,7 +418,6 @@ static void split_afs_acl(struct afs_acl *acl,
ace->rights & AFS_DIR_RIGHTS);
}
}
- return;
}
static bool same_principal(struct afs_ace *x, struct afs_ace *y)
diff --git a/source3/modules/vfs_dirsort.c b/source3/modules/vfs_dirsort.c
index f04f52d..98472f8 100644
--- a/source3/modules/vfs_dirsort.c
+++ b/source3/modules/vfs_dirsort.c
@@ -41,8 +41,6 @@ static void free_dirsort_privates(void **datap) {
SAFE_FREE(data->directory_list);
SAFE_FREE(data);
*datap = NULL;
-
- return;
}
static bool open_and_sort_dir (vfs_handle_struct *handle)
diff --git a/source3/modules/vfs_full_audit.c b/source3/modules/vfs_full_audit.c
index 1e5679d..3199503 100644
--- a/source3/modules/vfs_full_audit.c
+++ b/source3/modules/vfs_full_audit.c
@@ -558,8 +558,6 @@ static void do_log(vfs_op_type op, bool success, vfs_handle_struct *handle,
TALLOC_FREE(audit_pre);
TALLOC_FREE(op_msg);
TALLOC_FREE(tmp_do_log_ctx);
-
- return;
}
/**
@@ -638,8 +636,6 @@ static void smb_full_audit_disconnect(vfs_handle_struct *handle)
/* The bitmaps will be disconnected when the private
data is deleted. */
-
- return;
}
static uint64_t smb_full_audit_disk_free(vfs_handle_struct *handle,
@@ -770,7 +766,6 @@ static void smb_full_audit_seekdir(vfs_handle_struct *handle,
SMB_VFS_NEXT_SEEKDIR(handle, dirp, offset);
do_log(SMB_VFS_OP_SEEKDIR, True, handle, "");
- return;
}
static long smb_full_audit_telldir(vfs_handle_struct *handle,
@@ -791,7 +786,6 @@ static void smb_full_audit_rewinddir(vfs_handle_struct *handle,
SMB_VFS_NEXT_REWINDDIR(handle, dirp);
do_log(SMB_VFS_OP_REWINDDIR, True, handle, "");
- return;
}
static int smb_full_audit_mkdir(vfs_handle_struct *handle,
@@ -836,7 +830,6 @@ static void smb_full_audit_init_search_op(vfs_handle_struct *handle,
SMB_VFS_NEXT_INIT_SEARCH_OP(handle, dirp);
do_log(SMB_VFS_OP_INIT_SEARCH_OP, True, handle, "");
- return;
}
static int smb_full_audit_open(vfs_handle_struct *handle,
@@ -1748,8 +1741,6 @@ static void smb_full_audit_strict_unlock(struct vfs_handle_struct *handle,
do_log(SMB_VFS_OP_STRICT_UNLOCK, true, handle,
"%s:%llu-%llu:%d", fsp_str_do_log(fsp), plock->start,
plock->size);
-
- return;
}
static NTSTATUS smb_full_audit_translate_name(struct vfs_handle_struct *handle,
diff --git a/source3/modules/vfs_media_harmony.c b/source3/modules/vfs_media_harmony.c
index 0bc14d9..e2cb407 100644
--- a/source3/modules/vfs_media_harmony.c
+++ b/source3/modules/vfs_media_harmony.c
@@ -999,7 +999,6 @@ static void mh_seekdir(vfs_handle_struct *handle,
DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_seekdir\n"));
SMB_VFS_NEXT_SEEKDIR(handle,
((mh_dirinfo_struct*)dirp)->dirstream, offset);
- return;
}
/*
@@ -1024,7 +1023,6 @@ static void mh_rewinddir(vfs_handle_struct *handle,
DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_rewinddir\n"));
SMB_VFS_NEXT_REWINDDIR(handle,
((mh_dirinfo_struct*)dirp)->dirstream);
- return;
}
/*
@@ -1124,7 +1122,6 @@ static void mh_init_search_op(vfs_handle_struct *handle,
DEBUG(MH_INFO_DEBUG, ("Entering and leaving mh_init_search_op\n"));
SMB_VFS_NEXT_INIT_SEARCH_OP(handle,
((mh_dirinfo_struct*)dirp)->dirstream);
- return;
}
/*
diff --git a/source3/modules/vfs_shadow_copy2.c b/source3/modules/vfs_shadow_copy2.c
index bf61c92..af14e04 100644
--- a/source3/modules/vfs_shadow_copy2.c
+++ b/source3/modules/vfs_shadow_copy2.c
@@ -1065,8 +1065,6 @@ static void shadow_copy2_sort_data(vfs_handle_struct *handle,
shadow_copy2_data->num_volumes,
cmpfunc);
}
-
- return;
}
static int shadow_copy2_get_shadow_copy_data(
diff --git a/source3/modules/vfs_time_audit.c b/source3/modules/vfs_time_audit.c
index ff9cf05..9b42ec9 100644
--- a/source3/modules/vfs_time_audit.c
+++ b/source3/modules/vfs_time_audit.c
@@ -77,8 +77,6 @@ static void smb_time_audit_disconnect(vfs_handle_struct *handle)
if (timediff > audit_timeout) {
smb_time_audit_log("disconnect", timediff);
}
-
- return;
}
static uint64_t smb_time_audit_disk_free(vfs_handle_struct *handle,
@@ -279,7 +277,6 @@ static void smb_time_audit_seekdir(vfs_handle_struct *handle,
smb_time_audit_log("seekdir", timediff);
}
- return;
}
static long smb_time_audit_telldir(vfs_handle_struct *handle,
@@ -316,7 +313,6 @@ static void smb_time_audit_rewinddir(vfs_handle_struct *handle,
smb_time_audit_log("rewinddir", timediff);
}
- return;
}
static int smb_time_audit_mkdir(vfs_handle_struct *handle,
@@ -390,7 +386,6 @@ static void smb_time_audit_init_search_op(vfs_handle_struct *handle,
if (timediff > audit_timeout) {
smb_time_audit_log("init_search_op", timediff);
}
- return;
}
static int smb_time_audit_open(vfs_handle_struct *handle,
@@ -1558,8 +1553,6 @@ static void smb_time_audit_strict_unlock(struct vfs_handle_struct *handle,
if (timediff > audit_timeout) {
smb_time_audit_log("strict_unlock", timediff);
}
-
- return;
}
static NTSTATUS smb_time_audit_translate_name(struct vfs_handle_struct *handle,
--
Samba Shared Repository
More information about the samba-cvs
mailing list