talloc_init_named -> talloc_init.

Jeremy.

diff --git a/source/lib/talloctort.c b/source/lib/talloctort.c
index 3a648037761c379d5b1fc98f129e8c2c8789bd8b..ad5de38581dbe1c4fdd5bf386aaa0f8c7214e628 100644 (file)
--- a/source/lib/talloctort.c
+++ b/source/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/source/modules/vfs_netatalk.c b/source/modules/vfs_netatalk.c
index 353be36e6f01fab6cb481661a2b3b3b5e392c289..c869922a4c7543e1d4e05575983bded05a0e9918 100644 (file)
--- a/source/modules/vfs_netatalk.c
+++ b/source/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/source/modules/vfs_recycle.c b/source/modules/vfs_recycle.c
index 83fc41cfbde04208c3393fc88ad0f809c9e2443a..dcd83b7acdfbc28719e4c811399d6ab4af01b51f 100644 (file)
--- a/source/modules/vfs_recycle.c
+++ b/source/modules/vfs_recycle.c
@@ -104,7 +104,7 @@ vfs_op_tuple *vfs_init(int *vfs_version, struct vfs_ops *def_vfs_ops,
        }
 
        recycle_bin_private_handle = vfs_handle;
-       if (!(mem_ctx = talloc_init_named("recycle bin data"))) {
+       if (!(mem_ctx = talloc_init("recycle bin data"))) {
                DEBUG(0, ("Failed to allocate memory in VFS module recycle_bin\n"));
                return NULL;
        }
@@ -171,7 +171,7 @@ static int recycle_connect(struct connection_struct *conn, const char *service,
                return -1;
        }
 
-       if (!(ctx = talloc_init_named("recycle bin connection"))) {
+       if (!(ctx = talloc_init("recycle bin connection"))) {
                DEBUG(0, ("Failed to allocate memory in VFS module recycle_bin\n"));
                return -1;
        }

diff --git a/source/sam/account.c b/source/sam/account.c
index 1b43db57d98104c633e3d646785f9b686d09dfb4..b8336146cda23d2b5a74fe5086ca695abfc254c6 100644 (file)
--- a/source/sam/account.c
+++ b/source/sam/account.c
@@ -103,7 +103,7 @@ NTSTATUS sam_init_account(SAM_ACCOUNT_HANDLE **account)
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
        
-       mem_ctx = talloc_init_named("sam internal SAM_ACCOUNT_HANDLE allocation");
+       mem_ctx = talloc_init("sam internal SAM_ACCOUNT_HANDLE allocation");
 
        if (!mem_ctx) {
                DEBUG(0,("sam_init_account: error while doing talloc_init()\n"));

diff --git a/source/sam/group.c b/source/sam/group.c
index 7e4bcc1425c395c67fc3b1126211ca9c6210ace7..101e3dd7ce16be0c2124ed2aaa44c72b753d93cc 100644 (file)
--- a/source/sam/group.c
+++ b/source/sam/group.c
@@ -83,7 +83,7 @@ NTSTATUS sam_init_group(SAM_GROUP_HANDLE **group)
        TALLOC_CTX *mem_ctx;
        NTSTATUS nt_status;
        
-       mem_ctx = talloc_init_named("sam internal SAM_GROUP_HANDLE allocation");
+       mem_ctx = talloc_init("sam internal SAM_GROUP_HANDLE allocation");
 
        if (!mem_ctx) {
                DEBUG(0,("sam_init_group: error while doing talloc_init()\n"));

diff --git a/source/sam/gums_api.c b/source/sam/gums_api.c
index 1d67467b2b0825b3285abdd6b0a5bbef13f1e173..0061988eea9a708c77b2504ad0703c6834513aa6 100644 (file)
--- a/source/sam/gums_api.c
+++ b/source/sam/gums_api.c
@@ -795,7 +795,7 @@ NTSTATUS gums_create_commit_set(GUMS_COMMIT_SET **com_set, TALLOC_CTX *ctx, DOM_
        TALLOC_CTX *mem_ctx;
        GUMS_COMMIT_SET *set;
 
-       mem_ctx = talloc_init_named("commit_set");
+       mem_ctx = talloc_init("commit_set");
        if (mem_ctx == NULL)
                return NT_STATUS_NO_MEMORY;
        set = (GUMS_COMMIT_SET *)talloc(mem_ctx, sizeof(GUMS_COMMIT_SET));

diff --git a/source/sam/gums_helper.c b/source/sam/gums_helper.c
index d581d6574e22639d525e084ea62a4fb761173c25..8526a2f1cc0ab4a84b86d4d81613502f30be94df 100644 (file)
--- a/source/sam/gums_helper.c
+++ b/source/sam/gums_helper.c
@@ -372,7 +372,7 @@ NTSTATUS gums_init_builtin_groups(void)
        g_obj.type = GUMS_OBJ_GROUP;
        g_obj.version = 1;
        g_obj.seq_num = 0;
-       g_obj.mem_ctx = talloc_init_named("gums_init_backend_acct");
+       g_obj.mem_ctx = talloc_init("gums_init_backend_acct");
        if (g_obj.mem_ctx == NULL) {
                DEBUG(0, ("gums_init_backend: Out of Memory!\n"));
                return NT_STATUS_NO_MEMORY;
@@ -591,7 +591,7 @@ NTSTATUS gums_init_builtin_groups(void)
        g_priv.type = GUMS_OBJ_GROUP;
        g_priv.version = 1;
        g_priv.seq_num = 0;
-       g_priv.mem_ctx = talloc_init_named("gums_init_backend_priv");
+       g_priv.mem_ctx = talloc_init("gums_init_backend_priv");
        if (g_priv.mem_ctx == NULL) {
                DEBUG(0, ("gums_init_backend: Out of Memory!\n"));
                return NT_STATUS_NO_MEMORY;

diff --git a/source/sam/interface.c b/source/sam/interface.c
index d08df42122de12f2118c80e376a3f5a023af565f..51ae561999c40de946c4d239c3276827c4285a5b 100644 (file)
--- a/source/sam/interface.c
+++ b/source/sam/interface.c
@@ -384,7 +384,7 @@ NTSTATUS make_sam_context(SAM_CONTEXT **context)
 {
        TALLOC_CTX *mem_ctx;
 
-       mem_ctx = talloc_init_named("sam_context internal allocation context");
+       mem_ctx = talloc_init("sam_context internal allocation context");
 
        if (!mem_ctx) {
                DEBUG(0, ("make_sam_context: talloc init failed!\n"));

diff --git a/source/sam/sam_ads.c b/source/sam/sam_ads.c
index d2bfab53b91d72c2eae844de00850f5f3048819c..13e03690049abd1a2672ebe271649c4b0fe1d3b7 100755 (executable)
--- a/source/sam/sam_ads.c
+++ b/source/sam/sam_ads.c
@@ -584,8 +584,8 @@ static NTSTATUS sam_ads_get_sec_desc(const SAM_METHODS *sam_method, const NT_USE
                return ads_ntstatus(ads_status);
        }
 
-       if (!(mem_ctx = talloc_init_named("sec_desc parse in sam_ads"))) {
-               DEBUG(1, ("talloc_init_named() failed for sec_desc parse context in sam_ads"));
+       if (!(mem_ctx = talloc_init("sec_desc parse in sam_ads"))) {
+               DEBUG(1, ("talloc_init() failed for sec_desc parse context in sam_ads"));
                ads_msgfree(ads_struct, sec_desc_res);
                return NT_STATUS_NO_MEMORY;
        }
@@ -1323,8 +1323,8 @@ NTSTATUS sam_init_ads(SAM_METHODS *sam_method, const char *module_params)
                return NT_STATUS_NO_MEMORY;
        }
        
-       if (!(sam_ads_state->mem_ctx = talloc_init_named("sam_ads_method"))) {
-               DEBUG(0, ("talloc_init_named() failed for sam_ads_state->mem_ctx\n"));
+       if (!(sam_ads_state->mem_ctx = talloc_init("sam_ads_method"))) {
+               DEBUG(0, ("talloc_init() failed for sam_ads_state->mem_ctx\n"));
                return NT_STATUS_NO_MEMORY;
        }