From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 19 Apr 2012 06:31:40 +0000 (+1000)
Subject: s3-dbwrap: Remove dead code: talloc_stackframe() cannot fail
X-Git-Tag: samba-4.0.0alpha20~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00d493b00ced40f3a5dd39d9f1386ff5694872a3;p=thirdparty%2Fsamba.git

s3-dbwrap: Remove dead code: talloc_stackframe() cannot fail
---

diff --git a/source3/lib/dbwrap/dbwrap.c b/source3/lib/dbwrap/dbwrap.c
index 80bd09bf437..c78ee747a71 100644
--- a/source3/lib/dbwrap/dbwrap.c
+++ b/source3/lib/dbwrap/dbwrap.c
@@ -149,9 +149,6 @@ static struct db_record *dbwrap_fetch_locked_internal(
 	struct db_record *rec;
 	struct dbwrap_lock_order_state *lock_order;
 	TALLOC_CTX *frame = talloc_stackframe();
-	if (!frame) {
-		return NULL;
-	}
 
 	lock_order = dbwrap_check_lock_order(db, frame);
 	if (lock_order == NULL) {
@@ -242,9 +239,6 @@ NTSTATUS dbwrap_store(struct db_context *db, TDB_DATA key,
 	struct db_record *rec;
 	NTSTATUS status;
 	TALLOC_CTX *frame = talloc_stackframe();
-	if (!frame) {
-		return NT_STATUS_NO_MEMORY;
-	}
 
 	rec = dbwrap_fetch_locked(db, frame, key);
 	if (rec == NULL) {
@@ -262,11 +256,8 @@ NTSTATUS dbwrap_delete(struct db_context *db, TDB_DATA key)
 	struct db_record *rec;
 	NTSTATUS status;
 	TALLOC_CTX *frame = talloc_stackframe();
-	if (!frame) {
-		return NT_STATUS_NO_MEMORY;
-	}
 
-	rec = dbwrap_fetch_locked(db, talloc_tos(), key);
+	rec = dbwrap_fetch_locked(db, frame, key);
 	if (rec == NULL) {
 		TALLOC_FREE(frame);
 		return NT_STATUS_NO_MEMORY;