[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  93b3c15 vfs_fruit: Avoid double ()
       via  6dedccd vfs_fruit: Avoid double initialization
      from  0da7295 lib/texpect: prefer bsd/libutil.h if available

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


- Log -----------------------------------------------------------------
commit 93b3c157b7538e4610361e3d5491e5f762407b6f
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 16 09:38:54 2014 +0100

    vfs_fruit: Avoid double ()
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Thu Dec 18 19:19:04 CET 2014 on sn-devel-104

commit 6dedccd91d17e50bab8218e82331568abe18b853
Author: Volker Lendecke <vl at samba.org>
Date:   Tue Dec 16 09:38:21 2014 +0100

    vfs_fruit: Avoid double initialization
    
    Signed-off-by: Volker Lendecke <vl at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>

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

Summary of changes:
 source3/modules/vfs_fruit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
index a8bf7b4..ecaddfb 100644
--- a/source3/modules/vfs_fruit.c
+++ b/source3/modules/vfs_fruit.c
@@ -526,7 +526,7 @@ static bool ad_pack(struct adouble *ad)
 	offset += ADEDLEN_NENTRIES;
 
 	for (eid = 0, nent = 0; eid < ADEID_MAX; eid++) {
-		if ((ad->ad_eid[eid].ade_off == 0)) {
+		if (ad->ad_eid[eid].ade_off == 0) {
 			/*
 			 * ade_off is also used as indicator whether a
 			 * specific entry is used or not
@@ -3389,7 +3389,6 @@ static struct vfs_fn_pointers vfs_fruit_fns = {
 	.fstat_fn = fruit_fstat,
 	.streaminfo_fn = fruit_streaminfo,
 	.ntimes_fn = fruit_ntimes,
-	.unlink_fn = fruit_unlink,
 	.ftruncate_fn = fruit_ftruncate,
 	.fallocate_fn = fruit_fallocate,
 	.create_file_fn = fruit_create_file,


-- 
Samba Shared Repository