summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--source3/lib/talloctort.c2
-rw-r--r--source3/modules/vfs_netatalk.c10
-rw-r--r--source3/modules/vfs_recycle.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/talloctort.c b/source3/lib/talloctort.c
index 3a64803776..ad5de38581 100644
--- a/source3/lib/talloctort.c
+++ b/source3/lib/talloctort.c
@@ -29,7 +29,7 @@ int main(void)
TALLOC_CTX *ctx[NCTX];
for (i = 0; i < NCTX; i++) {
- ctx[i] = talloc_init_named("torture(%d)", i);
+ ctx[i] = talloc_init("torture(%d)", i);
}
for (i = 0; i < NCTX; i++) {
diff --git a/source3/modules/vfs_netatalk.c b/source3/modules/vfs_netatalk.c
index 353be36e6f..c869922a4c 100644
--- a/source3/modules/vfs_netatalk.c
+++ b/source3/modules/vfs_netatalk.c
@@ -223,7 +223,7 @@ static int atalk_rmdir(struct connection_struct *conn, const char *path)
strstr(path, APPLEDOUBLE) ? (add = False) : (add = True);
- if (!(ctx = talloc_init_named("remove_directory")))
+ if (!(ctx = talloc_init("remove_directory")))
goto exit_rmdir;
if (!(dpath = talloc_asprintf(ctx, "%s/%s%s",
@@ -252,7 +252,7 @@ static int atalk_rename(struct connection_struct *conn, const char *old, const c
if (!conn || !old) return ret;
- if (!(ctx = talloc_init_named("rename_file")))
+ if (!(ctx = talloc_init("rename_file")))
return ret;
if (atalk_build_paths(ctx, conn->origpath, old, &adbl_path, &orig_path,
@@ -308,7 +308,7 @@ static int atalk_unlink(struct connection_struct *conn, const char *path)
}
}
- if (!(ctx = talloc_init_named("unlink_file")))
+ if (!(ctx = talloc_init("unlink_file")))
return ret;
if (atalk_build_paths(ctx, conn->origpath, path, &adbl_path, &orig_path,
@@ -340,7 +340,7 @@ static int atalk_chmod(struct connection_struct *conn, const char *path, mode_t
if (!conn || !path) return ret;
- if (!(ctx = talloc_init_named("chmod_file")))
+ if (!(ctx = talloc_init("chmod_file")))
return ret;
if (atalk_build_paths(ctx, conn->origpath, path, &adbl_path, &orig_path,
@@ -372,7 +372,7 @@ static int atalk_chown(struct connection_struct *conn, const char *path, uid_t u
if (!conn || !path) return ret;
- if (!(ctx = talloc_init_named("chown_file")))
+ if (!(ctx = talloc_init("chown_file")))
return ret;
if (atalk_build_paths(ctx, conn->origpath, path, &adbl_path, &orig_path,
diff --git a/source3/modules/vfs_recycle.c b/source3/modules/vfs_recycle.c
index b59cb92a28..eedb65cd9d 100644
--- a/source3/modules/vfs_recycle.c
+++ b/source3/modules/vfs_recycle.c
@@ -119,7 +119,7 @@ static int recycle_connect(struct connection_struct *conn, const char *service,
DEBUG(10, ("Called for service %s (%d) as user %s\n", service, SNUM(conn), user));
- if (!(ctx = talloc_init_named("recycle bin"))) {
+ if (!(ctx = talloc_init("recycle bin"))) {
DEBUG(0, ("Failed to allocate memory in VFS module recycle_bin\n"));
return 0;
}