merged tools.h and internals.h in new private.h, excluded from API reference.

5 files changed, 57 insertions, 92 deletions

diff --git a/lasso/xml/Makefile.am b/lasso/xml/Makefile.am
index a001a61c..c1dab400 100644
--- a/lasso/xml/Makefile.am
+++ b/lasso/xml/Makefile.am
@@ -79,9 +79,7 @@ liblasso_xml_la_SOURCES = \
 	samlp_response_abstract.c \
 	samlp_status.c \
 	samlp_status_code.c \
-	utility_status.c \
-	tools.h \
-	internals.h
+	utility_status.c
 
 liblassoinclude_HEADERS = \
 	strings.h \
@@ -155,3 +153,8 @@ liblassoinclude_HEADERS = \
 	samlp_status.h \
 	samlp_status_code.h \
 	utility_status.h
+
+lasso_private_h_sources = \
+	private.h
+
+EXTRA_DIST = $(lasso_private_h_sources)
diff --git a/lasso/xml/internals.h b/lasso/xml/internals.h
deleted file mode 100644
index a5239ba3..00000000
--- a/lasso/xml/internals.h
+++ /dev/null
@@ -1,85 +0,0 @@
-/* $Id$ 
- *
- * Lasso - A free implementation of the Liberty Alliance specifications.
- *
- * Copyright (C) 2004 Entr'ouvert
- * http://lasso.entrouvert.org
- * 
- * Authors: Nicolas Clapies <nclapies@entrouvert.com>
- *          Valery Febvre <vfebvre@easter-eggs.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef __LASSO_INTERNALS_H__
-#define __LASSO_INTERNALS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum {
-	SNIPPET_NODE,
-	SNIPPET_CONTENT,
-	SNIPPET_TEXT_CHILD,
-	SNIPPET_NAME_IDENTIFIER,
-	SNIPPET_ATTRIBUTE,
-	SNIPPET_NODE_IN_CHILD,
-	SNIPPET_LIST_NODES,
-	SNIPPET_LIST_CONTENT,
-	SNIPPET_EXTENSION,
-	SNIPPET_SIGNATURE,
-
-	/* transformers for content transformation */
-	SNIPPET_STRING  = 1 << 0, /* default, can be omitted */
-	SNIPPET_BOOLEAN = 1 << 20,
-	SNIPPET_INTEGER = 1 << 21,
-	SNIPPET_LASSO_DUMP = 1 << 22,
-} SnippetType;
-
-struct XmlSnippet {
-	char *name;
-	SnippetType type;
-	guint offset;
-};
-
-struct QuerySnippet {
-	char *path;
-	char *field_name;
-};
-
-struct _LassoNodeClassData
-{
-	struct XmlSnippet *snippets;
-	struct QuerySnippet *query_snippets;
-	char *node_name;
-	xmlNs *ns;
-	int sign_type_offset;
-	int sign_method_offset;
-};
-
-void lasso_node_class_set_nodename(LassoNodeClass *klass, char *name);
-void lasso_node_class_set_ns(LassoNodeClass *klass, char *href, char *prefix);
-void lasso_node_class_add_snippets(LassoNodeClass *klass, struct XmlSnippet *snippets);
-void lasso_node_class_add_query_snippets(LassoNodeClass *klass, struct QuerySnippet *snippets);
-
-gchar* lasso_node_build_query_from_snippets(LassoNode *node);
-gboolean lasso_node_init_from_query_fields(LassoNode *node, char **query_fields);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __LASSO_INTERNALS_H__ */
diff --git a/lasso/xml/tools.h b/lasso/xml/private.h
index 56b141d3..29bca258 100644
--- a/lasso/xml/tools.h
+++ b/lasso/xml/private.h
@@ -34,6 +34,56 @@ extern "C" {
 #include <xmlsec/crypto.h>
 
 typedef enum {
+	SNIPPET_NODE,
+	SNIPPET_CONTENT,
+	SNIPPET_TEXT_CHILD,
+	SNIPPET_NAME_IDENTIFIER,
+	SNIPPET_ATTRIBUTE,
+	SNIPPET_NODE_IN_CHILD,
+	SNIPPET_LIST_NODES,
+	SNIPPET_LIST_CONTENT,
+	SNIPPET_EXTENSION,
+	SNIPPET_SIGNATURE,
+
+	/* transformers for content transformation */
+	SNIPPET_STRING  = 1 << 0, /* default, can be omitted */
+	SNIPPET_BOOLEAN = 1 << 20,
+	SNIPPET_INTEGER = 1 << 21,
+	SNIPPET_LASSO_DUMP = 1 << 22,
+} SnippetType;
+
+struct XmlSnippet {
+	char *name;
+	SnippetType type;
+	guint offset;
+};
+
+struct QuerySnippet {
+	char *path;
+	char *field_name;
+};
+
+struct _LassoNodeClassData
+{
+	struct XmlSnippet *snippets;
+	struct QuerySnippet *query_snippets;
+	char *node_name;
+	xmlNs *ns;
+	int sign_type_offset;
+	int sign_method_offset;
+};
+
+void lasso_node_class_set_nodename(LassoNodeClass *klass, char *name);
+void lasso_node_class_set_ns(LassoNodeClass *klass, char *href, char *prefix);
+void lasso_node_class_add_snippets(LassoNodeClass *klass, struct XmlSnippet *snippets);
+void lasso_node_class_add_query_snippets(LassoNodeClass *klass, struct QuerySnippet *snippets);
+
+gchar* lasso_node_build_query_from_snippets(LassoNode *node);
+gboolean lasso_node_init_from_query_fields(LassoNode *node, char **query_fields);
+
+
+
+typedef enum {
 	LASSO_PEM_FILE_TYPE_UNKNOWN,
 	LASSO_PEM_FILE_TYPE_PUB_KEY,
 	LASSO_PEM_FILE_TYPE_PRIVATE_KEY,
diff --git a/lasso/xml/tools.c b/lasso/xml/tools.c
index 39ef4dc9..befa7841 100644
--- a/lasso/xml/tools.c
+++ b/lasso/xml/tools.c
@@ -39,8 +39,6 @@
 #include <xmlsec/xmltree.h>
 
 #include <lasso/xml/xml.h>
-#include <lasso/xml/tools.h>
-
 
 /**
  * lasso_build_random_sequence:
diff --git a/lasso/xml/xml.h b/lasso/xml/xml.h
index cff2f91d..e76e6fc2 100644
--- a/lasso/xml/xml.h
+++ b/lasso/xml/xml.h
@@ -119,8 +119,7 @@ LASSO_EXPORT gint lasso_node_verify_signature(LassoNode *node,
 		const char *public_key_file, const char *ca_cert_chain_file);
 
 #ifdef LASSO_INTERNALS
-#include <lasso/xml/internals.h>
-#include <lasso/xml/tools.h>
+#include <lasso/xml/private.h>
 #endif
 
 #ifdef __cplusplus