From 0fe1ff99a1aa6858ec0f1cfb1130b801238fc8e2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Tue, 25 May 2010 01:00:37 +0200
Subject: s3:registry: move reg_objects.h to registry/ and use it only where
 needed

Every place outside of registry/ where this is used, should probably
be changed to use pure reg_api.c code.
---
 source3/include/reg_objects.h | 75 -------------------------------------------
 source3/include/registry.h    |  2 --
 2 files changed, 77 deletions(-)
 delete mode 100644 source3/include/reg_objects.h

(limited to 'source3/include')

diff --git a/source3/include/reg_objects.h b/source3/include/reg_objects.h
deleted file mode 100644
index 8cc74ed1bf..0000000000
--- a/source3/include/reg_objects.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* 
-   Samba's Internal Registry objects
-   
-   SMB parameters and setup
-   Copyright (C) Gerald Carter                   2002-2006.
-   
-   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 3 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, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _REG_OBJECTS_H /* _REG_OBJECTS_H */
-#define _REG_OBJECTS_H
-
-/* low level structure to contain registry values */
-
-struct regval_blob;
-
-/* container for registry values */
-
-struct regval_ctr;
-
-/* container for registry subkey names */
-
-struct regsubkey_ctr;
-
-/* The following definitions come from registry/reg_objects.c  */
-
-WERROR regsubkey_ctr_init(TALLOC_CTX *mem_ctx, struct regsubkey_ctr **ctr);
-WERROR regsubkey_ctr_reinit(struct regsubkey_ctr *ctr);
-WERROR regsubkey_ctr_set_seqnum(struct regsubkey_ctr *ctr, int seqnum);
-int regsubkey_ctr_get_seqnum(struct regsubkey_ctr *ctr);
-WERROR regsubkey_ctr_addkey( struct regsubkey_ctr *ctr, const char *keyname );
-WERROR regsubkey_ctr_delkey( struct regsubkey_ctr *ctr, const char *keyname );
-bool regsubkey_ctr_key_exists( struct regsubkey_ctr *ctr, const char *keyname );
-int regsubkey_ctr_numkeys( struct regsubkey_ctr *ctr );
-char* regsubkey_ctr_specific_key( struct regsubkey_ctr *ctr, uint32 key_index );
-WERROR regval_ctr_init(TALLOC_CTX *mem_ctx, struct regval_ctr **ctr);
-int regval_ctr_numvals(struct regval_ctr *ctr);
-struct regval_blob* dup_registry_value(struct regval_blob *val);
-void free_registry_value(struct regval_blob *val);
-uint8* regval_data_p(struct regval_blob *val);
-uint32 regval_size(struct regval_blob *val);
-char* regval_name(struct regval_blob *val);
-uint32 regval_type(struct regval_blob *val);
-struct regval_blob* regval_ctr_specific_value(struct regval_ctr *ctr,
-					      uint32 idx);
-bool regval_ctr_key_exists(struct regval_ctr *ctr, const char *value);
-struct regval_blob *regval_compose(TALLOC_CTX *ctx, const char *name,
-				   uint16 type,
-				   const uint8 *data_p, size_t size);
-int regval_ctr_addvalue(struct regval_ctr *ctr, const char *name, uint16 type,
-			const uint8 *data_p, size_t size);
-int regval_ctr_addvalue_sz(struct regval_ctr *ctr, const char *name, const char *data);
-int regval_ctr_addvalue_multi_sz(struct regval_ctr *ctr, const char *name, const char **data);
-int regval_ctr_copyvalue(struct regval_ctr *ctr, struct regval_blob *val);
-int regval_ctr_delvalue(struct regval_ctr *ctr, const char *name);
-struct regval_blob* regval_ctr_getvalue(struct regval_ctr *ctr,
-					const char *name);
-int regval_ctr_get_seqnum(struct regval_ctr *ctr);
-WERROR regval_ctr_set_seqnum(struct regval_ctr *ctr, int seqnum);
-uint32 regval_dword(struct regval_blob *val);
-const char *regval_sz(struct regval_blob *val);
-
-
-#endif /* _REG_OBJECTS_H */
diff --git a/source3/include/registry.h b/source3/include/registry.h
index 6b43b522bc..762928f378 100644
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -1,8 +1,6 @@
 #ifndef _REGISTRY_H
 #define _REGISTRY_H
 
-#include "reg_objects.h"
-
 /*
  * A REG_SZ string is not necessarily NULL terminated. When retrieving it from
  * the net, we guarantee this however. A server might want to push it without
-- 
cgit