xml: rename xpath functions

s/xml_add_node/xpath_add_node/
s/get_node/xpath_get_node/
s/xml_get_content/xpath_get_content/

Author: johanmalm

tests/t1000-add-xpath-node.c

@@ -49,7 +49,7 @@ int main(int argc, char **argv)
 	/* test 1 */
 	diag("add node <theme><cornerradius> using xpath (lowercase)");
 	xml_init(in);
-	xml_add_node("/labwc_config/theme/cornerradius");
+	xpath_add_node("/labwc_config/theme/cornerradius");
 	xml_save_as(out);
 	xml_finish();
 	test(out,
@@ -66,7 +66,7 @@ int main(int argc, char **argv)
 	/* test 2 */
 	diag("add node <theme><cornerRadius> using xpath (camelCase)");
 	xml_init(in);
-	xml_add_node("/labwc_config/theme/cornerRadius");
+	xpath_add_node("/labwc_config/theme/cornerRadius");
 	xml_save_as(out);
 	xml_finish();
 	test(out,
@@ -83,8 +83,8 @@ int main(int argc, char **argv)
 	/* test 3 */
 	diag("check xpath does not add duplicate entries - when identical");
 	xml_init(in);
-	xml_add_node("/labwc_config/theme/cornerradius");
-	xml_add_node("/labwc_config/theme/cornerradius");
+	xpath_add_node("/labwc_config/theme/cornerradius");
+	xpath_add_node("/labwc_config/theme/cornerradius");
 	xml_save_as(out);
 	xml_finish();
 	test(out,
@@ -101,8 +101,8 @@ int main(int argc, char **argv)
 	/* test 4 */
 	diag("check xpath does not add duplicate entries - even if they have differing capitalisation");
 	xml_init(in);
-	xml_add_node("/labwc_config/theme/cornerradius");
-	xml_add_node("/labwc_config/theme/Cornerradius");
+	xpath_add_node("/labwc_config/theme/cornerradius");
+	xpath_add_node("/labwc_config/theme/Cornerradius");
 	xml_save_as(out);
 	xml_finish();
 	test(out,

tests/t1001-nodenames.c

@@ -37,7 +37,7 @@ int main(int argc, char **argv)
 	/* test 1 */
 	diag("generate simple xpath style nodename");
 	xml_init(in);
-	xmlNode *node = get_node((xmlChar *)"/labwc_config/core/gap");
+	xmlNode *node = xpath_get_node((xmlChar *)"/labwc_config/core/gap");
 	char *name = nodename(node, buffer, sizeof(buffer));
 	xml_finish();
 	test(name, "/labwc_config/core/gap");

xml.c

@@ -231,7 +231,7 @@ xml_get_node(char *nodename)
 }
 
 char *
-xml_get_content(char *xpath_expr)
+xpath_get_content(char *xpath_expr)
 {
 	xmlChar *ret = NULL;
 	xmlXPathObjectPtr object = xmlXPathEvalExpression((xmlChar *)xpath_expr, ctx.xpath_ctx_ptr);
@@ -266,7 +266,7 @@ xml_get_content(char *xpath_expr)
 
 /* case-sensitive */
 static xmlNode *
-get_node(xmlChar *expr)
+xpath_get_node(xmlChar *expr)
 {
 	xmlNode *ret = NULL;
 	xmlXPathObjectPtr object = xmlXPathEvalExpression(expr, ctx.xpath_ctx_ptr);
@@ -292,7 +292,7 @@ get_node(xmlChar *expr)
 }
 
 void
-xml_add_node(char *xpath_expr)
+xpath_add_node(char *xpath_expr)
 {
 	if (xml_get_node(xpath_expr)) {
 		return;
@@ -302,7 +302,7 @@ xml_add_node(char *xpath_expr)
 	char *parent_expr = strdup(xpath_expr);
 	xmlNode *parent_node = NULL;
 	while (parent_expr && *parent_expr) {
-		parent_node = get_node((xmlChar *)parent_expr);
+		parent_node = xpath_get_node((xmlChar *)parent_expr);
 		if (parent_node) {
 			break;
 		}

xml.h

@@ -12,17 +12,17 @@ int xml_get_int(char *nodename);
 int xml_get_bool_text(char *nodename);
 
 /**
- * xml_get_content - get content of node specified by xpath
+ * xpath_get_content() - Get content of node specified by xpath
  * @xpath_expr: xpath expression for node
  */
-char *xml_get_content(char *xpath_expr);
+char *xpath_get_content(char *xpath_expr);
 
 /**
- * xml_add_node - add xml nodes from xpath
+ * xpath_add_node - add xml nodes from xpath
  * @xpath_expr: xpath expression for new node
  * For example xpath_expr="/labwc_config/a/b/c" creates
  * <labwc_config><a><b><c /></b></a></labwc_config>
  */
-void xml_add_node(char *xpath_expr);
+void xpath_add_node(char *xpath_expr);
 
 #endif /* __XML_H */