From c580cb90e7df9a2438247b68b60577fa335896b0 Mon Sep 17 00:00:00 2001
From: David Sommerseth <dazo@users.sourceforge.net>
Date: Sun, 27 Sep 2009 16:45:57 +0200
Subject: Code clean up.  Moved xmlReplaceChars() to eurephia_xml.c

---
 common/eurephia_xml.c                          | 21 +++++++++++++++++++++
 common/eurephia_xml.h                          |  2 ++
 database/sqlite/administration.c               | 21 ---------------------
 database/sqlite/administration/certificates.c  |  1 -
 database/sqlite/administration/firewalladmin.c |  2 --
 database/sqlite/administration/lastlog.c       |  2 --
 database/sqlite/administration/useraccount.c   |  3 ---
 database/sqlite/administration/usercerts.c     |  2 --
 8 files changed, 23 insertions(+), 31 deletions(-)

diff --git a/common/eurephia_xml.c b/common/eurephia_xml.c
index d47ef85..dec397f 100644
--- a/common/eurephia_xml.c
+++ b/common/eurephia_xml.c
@@ -42,6 +42,27 @@
 #include <eurephia_xml.h>
 
 
+/**
+ * String replace in a xmlChar based string
+ *
+ * @param str xmlChar input string
+ * @param s   search for this character
+ * @param r   replace the character with this one
+ */
+void xmlReplaceChars(xmlChar *str, char s, char r) {
+        if( str != NULL ) {
+                xmlChar *ptr = str;
+
+                while( *ptr != '\0' ) {
+                        if( *ptr == s ) {
+                                *ptr = r;
+                        }
+                        ptr++;
+                }
+        }
+}
+
+
 /**
  * Retrieves a given XML node attribute/property
  *
diff --git a/common/eurephia_xml.h b/common/eurephia_xml.h
index 2ee1175..083a881 100644
--- a/common/eurephia_xml.h
+++ b/common/eurephia_xml.h
@@ -62,6 +62,8 @@ typedef struct _eurephiaRESULT {
  */
 #define foreach_xmlnode(start, itn)  for( itn = start; itn != NULL; itn = itn->next )
 
+void xmlReplaceChars(xmlChar *str, char s, char r);
+
 char *xmlGetAttrValue(xmlAttr *properties, const char *key);
 xmlNode *xmlFindNode(xmlNode *node, const char *key);
 
diff --git a/database/sqlite/administration.c b/database/sqlite/administration.c
index 59180a9..759943b 100644
--- a/database/sqlite/administration.c
+++ b/database/sqlite/administration.c
@@ -69,27 +69,6 @@
  *
  */
 
-/**
- * Internal function.  String replace in a xmlChar based string
- *
- * @param str xmlChar input string
- * @param s   search for this character
- * @param r   replace the character with this one
- */
-void xmlReplaceChars(xmlChar *str, char s, char r) {
-        if( str != NULL ) {
-                xmlChar *ptr = str;
-
-                while( *ptr != '\0' ) {
-                        if( *ptr == s ) {
-                                *ptr = r;
-                        }
-                        ptr++;
-                }
-        }
-}
-
-
 /**
  * @copydoc eDBadminAuth()
  */
diff --git a/database/sqlite/administration/certificates.c b/database/sqlite/administration/certificates.c
index e00de73..b64aa07 100644
--- a/database/sqlite/administration/certificates.c
+++ b/database/sqlite/administration/certificates.c
@@ -55,7 +55,6 @@
 #define FMAP_CERTS              /**< fieldmapping.h: Include declaration of tbl_sqlite_certs */
 #include "../fieldmapping.h"
 
-void xmlReplaceChars(xmlChar *str, char s, char r);
 
 /**
  * Internal function.  Retrieves info about one or more certificates
diff --git a/database/sqlite/administration/firewalladmin.c b/database/sqlite/administration/firewalladmin.c
index 6c6b91e..fdebccb 100644
--- a/database/sqlite/administration/firewalladmin.c
+++ b/database/sqlite/administration/firewalladmin.c
@@ -58,8 +58,6 @@
 #define FMAP_OVPNACCESSES
 #include "../fieldmapping.h"
 
-void xmlReplaceChars(xmlChar *str, char s, char r);
-
 
 /**
  * Internal function.  Queries the database for a list of user-certificate links
diff --git a/database/sqlite/administration/lastlog.c b/database/sqlite/administration/lastlog.c
index 15703ce..e850d94 100644
--- a/database/sqlite/administration/lastlog.c
+++ b/database/sqlite/administration/lastlog.c
@@ -54,8 +54,6 @@
 #define FMAP_LASTLOG            /**< fieldmapping.h: Include declaration of tbl_sqlite_lastlog */
 #include "../fieldmapping.h"
 
-void xmlReplaceChars(xmlChar *str, char s, char r);
-
 
 /**
  * @copydoc eDBadminGetLastlog()
diff --git a/database/sqlite/administration/useraccount.c b/database/sqlite/administration/useraccount.c
index 8a45eec..348e466 100644
--- a/database/sqlite/administration/useraccount.c
+++ b/database/sqlite/administration/useraccount.c
@@ -57,9 +57,6 @@
 #include "../fieldmapping.h"
 
 
-void xmlReplaceChars(xmlChar *str, char s, char r);
-
-
 /**
  * Internal function.  Adds a child node named \<flag\> to an xmlNode containing a flag value
  *
diff --git a/database/sqlite/administration/usercerts.c b/database/sqlite/administration/usercerts.c
index 4573842..8e235c5 100644
--- a/database/sqlite/administration/usercerts.c
+++ b/database/sqlite/administration/usercerts.c
@@ -57,8 +57,6 @@
 #define FMAP_USERCERTS
 #include "../fieldmapping.h"
 
-void xmlReplaceChars(xmlChar *str, char s, char r);
-
 
 /**
  * Internal function.  Queries the database for a list of user-certificate links
-- 
cgit