s3:registry: move prototypes from reg_init_basic.c to their own header.

diff --git a/source3/include/registry.h b/source3/include/registry.h
index 09a8333eb3529db81e6f0b52ddb0067bfd3319c7..03b4a5c3ccff90e9e2dab4accf8a397b29d194a0 100644 (file)
--- a/source3/include/registry.h
+++ b/source3/include/registry.h
@@ -130,11 +130,6 @@ struct registry_key {
 #define REG_KEY_HKPT           2
 
 
-/* The following definitions come from registry/reg_init_basic.c  */
-
-WERROR registry_init_common(void);
-WERROR registry_init_basic(void);
-
 /* The following definitions come from registry/reg_init_full.c  */
 
 WERROR registry_init_full(void);

diff --git a/source3/libgpo/gpo_reg.c b/source3/libgpo/gpo_reg.c
index 851fddcf20a71233abc18cb66d83b8cfb91c4b5f..83f7e8de7824dbc13c7e43f793a274006150d75a 100644 (file)
--- a/source3/libgpo/gpo_reg.c
+++ b/source3/libgpo/gpo_reg.c
@@ -24,6 +24,7 @@
 #include "registry/reg_api.h"
 #include "registry/reg_backend_db.h"
 #include "registry/reg_api_util.h"
+#include "registry/reg_init_basic.h"
 
 
 /****************************************************************

diff --git a/source3/registry/reg_init_basic.c b/source3/registry/reg_init_basic.c
index 097be39b33e9aa9fe95a811f93f62dc984cfb69a..ea8077fc145dc61f44cacc54a92fdf376beb8ae1 100644 (file)
--- a/source3/registry/reg_init_basic.c
+++ b/source3/registry/reg_init_basic.c
@@ -19,6 +19,7 @@
 
 #include "includes.h"
 #include "registry.h"
+#include "reg_init_basic.h"
 #include "reg_cachehook.h"
 #include "reg_backend_db.h"
 

diff --git a/source3/registry/reg_init_basic.h b/source3/registry/reg_init_basic.h
new file mode 100644 (file)
index 0000000..4149b5d
--- /dev/null
+++ b/source3/registry/reg_init_basic.h
@@ -0,0 +1,26 @@
+/*
+ * Unix SMB/CIFS implementation.
+ * Registry helper routines
+ * Copyright (C) Michael Adam 2008
+ *
+ * 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_INIT_BASIC_H
+#define _REG_INIT_BASIC_H
+
+WERROR registry_init_common(void);
+WERROR registry_init_basic(void);
+
+#endif /* _REG_INIT_BASIC_H */

diff --git a/source3/registry/reg_init_full.c b/source3/registry/reg_init_full.c
index c99d974f55745d25ba32290e0ed6d0db9a242ea9..e17bc413c2fe438e60f868f26adebf8af9e599ff 100644 (file)
--- a/source3/registry/reg_init_full.c
+++ b/source3/registry/reg_init_full.c
@@ -26,6 +26,7 @@
 #include "reg_backend_db.h"
 #include "reg_perfcount.h"
 #include "reg_eventlog.h"
+#include "reg_init_basic.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/registry/reg_init_smbconf.c b/source3/registry/reg_init_smbconf.c
index f8110495575b21daa661be7b9dd45661ee3b952b..e2024df8b52cfd8404006d4f4069d37c9656f8a2 100644 (file)
--- a/source3/registry/reg_init_smbconf.c
+++ b/source3/registry/reg_init_smbconf.c
@@ -21,6 +21,7 @@
 #include "registry.h"
 #include "reg_cachehook.h"
 #include "reg_backend_db.h"
+#include "reg_init_basic.h"
 
 #undef DBGC_CLASS
 #define DBGC_CLASS DBGC_REGISTRY

diff --git a/source3/utils/net_registry.c b/source3/utils/net_registry.c
index 751972515fa08124adf0848b043fda1574c00fea..9b3f561d8dfd6dddd4802b7b0ea2bec108ad9385 100644 (file)
--- a/source3/utils/net_registry.c
+++ b/source3/utils/net_registry.c
@@ -23,6 +23,7 @@
 #include "registry.h"
 #include "registry/reg_api.h"
 #include "registry/reg_util_token.h"
+#include "registry/reg_init_basic.h"
 #include "utils/net.h"
 #include "utils/net_registry_util.h"
 #include "include/g_lock.h"