s3-talloc Change TALLOC_ARRAY() to talloc_array()

[kai/samba.git] / source3 / modules / vfs_cap.c

diff --git a/source3/modules/vfs_cap.c b/source3/modules/vfs_cap.c
index 89f16891a9b09140ab915730fe6f36689e45c908..15bebf6fea020f147fc49ff2494a828be235b4d0 100644 (file)
--- a/source3/modules/vfs_cap.c
+++ b/source3/modules/vfs_cap.c
@@ -23,6 +23,7 @@
 
 
 #include "includes.h"
+#include "smbd/smbd.h"
 
 /* cap functions */
 static char *capencode(TALLOC_CTX *ctx, const char *from);
@@ -74,7 +75,7 @@ static SMB_STRUCT_DIRENT *cap_readdir(vfs_handle_struct *handle,
        }
        DEBUG(3,("cap: cap_readdir: %s\n", newname));
        newnamelen = strlen(newname)+1;
-       newdirent = (SMB_STRUCT_DIRENT *)TALLOC_ARRAY(talloc_tos(),
+       newdirent = (SMB_STRUCT_DIRENT *)talloc_array(talloc_tos(),
                        char,
                        sizeof(SMB_STRUCT_DIRENT)+
                                newnamelen);
@@ -575,7 +576,7 @@ static struct vfs_fn_pointers vfs_cap_fns = {
        .readdir = cap_readdir,
        .mkdir = cap_mkdir,
        .rmdir = cap_rmdir,
-       .open = cap_open,
+       .open_fn = cap_open,
        .rename = cap_rename,
        .stat = cap_stat,
        .lstat = cap_lstat,
@@ -662,7 +663,7 @@ static char *capencode(TALLOC_CTX *ctx, const char *from)
        }
        len++;
 
-       to = TALLOC_ARRAY(ctx, char, len);
+       to = talloc_array(ctx, char, len);
        if (!to) {
                return NULL;
        }
@@ -703,7 +704,7 @@ static char *capdecode(TALLOC_CTX *ctx, const char *from)
        }
        len++;
 
-       to = TALLOC_ARRAY(ctx, char, len);
+       to = talloc_array(ctx, char, len);
        if (!to) {
                return NULL;
        }