Import talloc_stack into util library.

2 files changed, 1 insertions, 57 deletions

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 6b25982ff7..035d46fe0a 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -654,7 +654,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "dbwrap.h"
 #include "packet.h"
 #include "ctdbd_conn.h"
-#include "talloc_stack.h"
+#include "../lib/util/talloc_stack.h"
 #include "memcache.h"
 #include "async_req.h"
 #include "async_smb.h"
diff --git a/source3/include/talloc_stack.h b/source3/include/talloc_stack.h
deleted file mode 100644
index bb22b8a029..0000000000
--- a/source3/include/talloc_stack.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-   Unix SMB/CIFS implementation.
-   Implement a stack of talloc contexts
-   Copyright (C) Volker Lendecke 2007
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-/*
- * Implement a stack of talloc frames.
- *
- * When a new talloc stackframe is allocated with talloc_stackframe(), then
- * the TALLOC_CTX returned with talloc_tos() is reset to that new
- * frame. Whenever that stack frame is TALLOC_FREE()'ed, then the reverse
- * happens: The previous talloc_tos() is restored.
- *
- * This API is designed to be robust in the sense that if someone forgets to
- * TALLOC_FREE() a stackframe, then the next outer one correctly cleans up and
- * resets the talloc_tos().
- *
- */
-
-#ifndef _TALLOC_STACK_H
-#define _TALLOC_STACK_H
-
-#include "../talloc/talloc.h"
-
-/*
- * Create a new talloc stack frame.
- *
- * When free'd, it frees all stack frames that were created after this one and
- * not explicitly freed.
- */
-
-TALLOC_CTX *talloc_stackframe(void);
-TALLOC_CTX *talloc_stackframe_pool(size_t poolsize);
-
-/*
- * Get us the current top of the talloc stack.
- */
-
-TALLOC_CTX *talloc_tos(void);
-
-#endif