From f654d435b157ba89eeae4a0b461260037c53cd0b Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Thu, 29 Nov 2012 16:12:03 +1030
Subject: [PATCH] Rename some new config source and header files

---
 conf_parse.c                     |  6 +++---
 config_schema.c => conf_schema.c |  0
 config_schema.h => conf_schema.h |  0
 config.h                         | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)
 rename config_schema.c => conf_schema.c (100%)
 rename config_schema.h => conf_schema.h (100%)

diff --git a/conf_parse.c b/conf_parse.c
index 8d52c41e..4f71cce1 100644
--- a/conf_parse.c
+++ b/conf_parse.c
@@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define VALUE_SUB_STRUCT(__structname)
 #define VALUE_NODE_STRUCT(__structname, __eltparser)
 #define END_ARRAY(__size)
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef STRUCT
 #undef NODE
 #undef ATOM
@@ -91,7 +91,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define VALUE_NODE_STRUCT(__structname, __eltparser)
 #define END_ARRAY(__size) \
     }
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef STRUCT
 #undef NODE
 #undef ATOM
@@ -251,7 +251,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #define VALUE_NODE_STRUCT(__structname, __eltparser) \
       __ARRAY_VALUE(__eltparser(&array->av[n].value, child))
 
-#include "config_schema.h"
+#include "conf_schema.h"
 
 #undef STRUCT
 #undef NODE
diff --git a/config_schema.c b/conf_schema.c
similarity index 100%
rename from config_schema.c
rename to conf_schema.c
diff --git a/config_schema.h b/conf_schema.h
similarity index 100%
rename from config_schema.h
rename to conf_schema.h
diff --git a/config.h b/config.h
index 82960159..c4269f3f 100644
--- a/config.h
+++ b/config.h
@@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #ifndef __SERVALDNA_CONFIG_H
 #define __SERVALDNA_CONFIG_H
 
-/* This file defines the internal API to the configuration file.  See "config_schema.h" for the
+/* This file defines the internal API to the configuration file.  See "conf_schema.h" for the
  * definition of the configuration schema, which is used to generate these API components.
  *
  * Each STRUCT(NAME, ...) schema declaration generates the following data declaration:
@@ -299,7 +299,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
 #define END_ARRAY(__size) \
         } av[(__size)]; \
     };
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef STRUCT
 #undef NODE
 #undef ATOM
@@ -336,7 +336,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
 #define VALUE_SUB_STRUCT(__structname)
 #define VALUE_NODE_STRUCT(__structname, __eltparser)
 #define END_ARRAY(__size)
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef STRUCT
 #undef NODE
 #undef ATOM
@@ -390,7 +390,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
 #define VALUE_NODE_STRUCT(__structname, __eltparser) \
     int __eltparser(struct config_##__structname *, const struct cf_om_node *);
 #define END_ARRAY(__size)
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef __VALIDATOR
 #undef STRUCT
 #undef NODE
@@ -429,7 +429,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
 #define VALUE_SUB_STRUCT(__structname)
 #define VALUE_NODE_STRUCT(__structname, __eltparser)
 #define END_ARRAY(__size)
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef ARRAY
 #undef KEY_ATOM
 #undef KEY_STRING
@@ -439,7 +439,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
         ,##__cmpfunc;
 #define KEY_STRING(__strsize, __eltparser, __cmpfunc...) \
         ,##__cmpfunc;
-#include "config_schema.h"
+#include "conf_schema.h"
 #undef STRUCT
 #undef NODE
 #undef ATOM