Changeset 224 for branches/samba-3.3.x/source/modules

Timestamp:

May 24, 2009, 7:55:48 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update Samba 3.3 branch to 3.3.4

File:

• branches/samba-3.3.x/source/modules/vfs_gpfs.c (modified) (6 diffs)

branches/samba-3.3.x/source/modules/vfs_gpfs.c

@@ -342 +342 @@
                 (smb_get_naces(smbacl)-1)*sizeof(gpfs_ace_v4_t);
 
-        gacl = TALLOC_SIZE(mem_ctx, gacl_len);
+        gacl = (struct gpfs_acl *)TALLOC_SIZE(mem_ctx, gacl_len);
         if (gacl == NULL) {
                 DEBUG(0, ("talloc failed\n"));
@@ -557 +557 @@
 }
 
-SMB_ACL_T gpfsacl_sys_acl_get_file(vfs_handle_struct *handle,
-                                    const char *path_p,
-                                    SMB_ACL_TYPE_T type)
+static SMB_ACL_T gpfsacl_sys_acl_get_file(vfs_handle_struct *handle,
+                                          const char *path_p,
+                                          SMB_ACL_TYPE_T type)
 {
         gpfs_aclType_t gpfs_type;
@@ -578 +578 @@
 }
 
-SMB_ACL_T gpfsacl_sys_acl_get_fd(vfs_handle_struct *handle,
-                                 files_struct *fsp)
+static SMB_ACL_T gpfsacl_sys_acl_get_fd(vfs_handle_struct *handle,
+                                        files_struct *fsp)
 {
         return gpfsacl_get_posix_acl(fsp->fsp_name, GPFS_ACL_TYPE_ACCESS);
@@ -601 +601 @@
                 (pacl->count)*sizeof(gpfs_ace_v1_t);
 
-        result = SMB_MALLOC(len);
+        result = (struct gpfs_acl *)SMB_MALLOC(len);
         if (result == NULL) {
                 errno = ENOMEM;
@@ -671 +671 @@
 }
 
-int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle,
-                              const char *name,
-                              SMB_ACL_TYPE_T type,
-                              SMB_ACL_T theacl)
+static int gpfsacl_sys_acl_set_file(vfs_handle_struct *handle,
+                                    const char *name,
+                                    SMB_ACL_TYPE_T type,
+                                    SMB_ACL_T theacl)
 {
         struct gpfs_acl *gpfs_acl;
@@ -690 +690 @@
 }
 
-int gpfsacl_sys_acl_set_fd(vfs_handle_struct *handle,
-                            files_struct *fsp,
-                            SMB_ACL_T theacl)
+static int gpfsacl_sys_acl_set_fd(vfs_handle_struct *handle,
+                                  files_struct *fsp,
+                                  SMB_ACL_T theacl)
 {
         return gpfsacl_sys_acl_set_file(handle, fsp->fsp_name, SMB_ACL_TYPE_ACCESS, theacl);
 }
 
-int gpfsacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
-                                     const char *path)
+static int gpfsacl_sys_acl_delete_def_file(vfs_handle_struct *handle,
+                                           const char *path)
 {
         errno = ENOTSUP;