Merge branch 'saedit' into 'master's20190422

update saedit to saedit2

See merge request evol/evol-tools!23

1 files changed, 48 insertions, 20 deletions

diff --git a/saedit/xml.h b/saedit/xml.h
index 584c568..2622f17 100644
--- a/saedit/xml.h
+++ b/saedit/xml.h
@@ -1,13 +1,3 @@
-/*=======================================*\
-|  ____                         ____      |
-| /    \         /\            |          |
-| \____         /  \           |____      |
-|      \       /____\          |          |
-| \____/prite /      \nimation |____ditor |
-|                                         |
-|      Copyleft Vasily_Makarov 2011       |
-|                                         |
-\*=======================================*/
 #ifndef XML_H
 #define XML_H
 
@@ -18,25 +8,63 @@
 typedef struct {
 	gchar  *name;
 	gchar  *text;
-	gchar  **attributes;
-	int line_number;
-	GList *sub_nodes;
+	gchar **attributes;
+	gint    line_no;
+	GList  *sub_nodes;
 } XMLNode;
 
 
-XMLNode *xml_parse_file    (const gchar    *name);
+XMLNode *
+xml_parse_file (
+	const gchar *name
+);
 
-XMLNode *xml_parse_buffer  (const gchar    *buffer, GError **error);
+XMLNode *
+xml_parse_buffer (
+	const gchar *buffer,
+	GError **error
+);
 
-void     xml_free          (XMLNode        *node);
+void xml_free (XMLNode *node);
+void xml_output (
+	const XMLNode  *node,
+	GString        *output
+);
+
+gchar **
+xml_attr_new (
+	const gchar *name,
+	const gchar *value
+);
+
+gchar *
+xml_node_get_attr_value (
+	const XMLNode *node,
+	const gchar   *attr_name
+);
+
+gint
+xml_node_get_int_attr_value (
+	const XMLNode *node,
+	const gchar *attr_name,
+	gint retval
+);
+
+gint
+xml_node_get_int_attr_value_limited (
+	const XMLNode *node,
+	const gchar   *attr_name,
+	gint           retval,
+	gint           lower,
+	gint           upper
+);
 
-void     xml_output        (const XMLNode  *node,
-                            GString        *output);
 
-gchar  **xml_attr_new(const gchar *name, const gchar *value);
-gchar	*xml_node_get_attr_value(const XMLNode *node, const gchar *attr_name);
 gint	 xml_node_compare_with_name_func(gconstpointer a, gconstpointer b);
+
+/*
 gint	 xml_node_compare_with_action_node_by_imageset_name_func(gconstpointer a, gconstpointer b);
 gint	 xml_node_compare_with_attr_func(const XMLNode *node, const gchar **attr);
+*/
 
 #endif