Rename some new config source and header files

This commit is contained in:
Andrew Bettison 2012-11-29 16:12:03 +10:30
parent 2853d346f1
commit f654d435b1
4 changed files with 9 additions and 9 deletions

View File

@ -49,7 +49,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_SUB_STRUCT(__structname) #define VALUE_SUB_STRUCT(__structname)
#define VALUE_NODE_STRUCT(__structname, __eltparser) #define VALUE_NODE_STRUCT(__structname, __eltparser)
#define END_ARRAY(__size) #define END_ARRAY(__size)
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE
#undef ATOM #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 VALUE_NODE_STRUCT(__structname, __eltparser)
#define END_ARRAY(__size) \ #define END_ARRAY(__size) \
} }
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE
#undef ATOM #undef ATOM
@ -251,7 +251,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#define VALUE_NODE_STRUCT(__structname, __eltparser) \ #define VALUE_NODE_STRUCT(__structname, __eltparser) \
__ARRAY_VALUE(__eltparser(&array->av[n].value, child)) __ARRAY_VALUE(__eltparser(&array->av[n].value, child))
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE

View File

@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#ifndef __SERVALDNA_CONFIG_H #ifndef __SERVALDNA_CONFIG_H
#define __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. * definition of the configuration schema, which is used to generate these API components.
* *
* Each STRUCT(NAME, ...) schema declaration generates the following data declaration: * 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) \ #define END_ARRAY(__size) \
} av[(__size)]; \ } av[(__size)]; \
}; };
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE
#undef ATOM #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_SUB_STRUCT(__structname)
#define VALUE_NODE_STRUCT(__structname, __eltparser) #define VALUE_NODE_STRUCT(__structname, __eltparser)
#define END_ARRAY(__size) #define END_ARRAY(__size)
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE
#undef ATOM #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) \ #define VALUE_NODE_STRUCT(__structname, __eltparser) \
int __eltparser(struct config_##__structname *, const struct cf_om_node *); int __eltparser(struct config_##__structname *, const struct cf_om_node *);
#define END_ARRAY(__size) #define END_ARRAY(__size)
#include "config_schema.h" #include "conf_schema.h"
#undef __VALIDATOR #undef __VALIDATOR
#undef STRUCT #undef STRUCT
#undef NODE #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_SUB_STRUCT(__structname)
#define VALUE_NODE_STRUCT(__structname, __eltparser) #define VALUE_NODE_STRUCT(__structname, __eltparser)
#define END_ARRAY(__size) #define END_ARRAY(__size)
#include "config_schema.h" #include "conf_schema.h"
#undef ARRAY #undef ARRAY
#undef KEY_ATOM #undef KEY_ATOM
#undef KEY_STRING #undef KEY_STRING
@ -439,7 +439,7 @@ void cf_warn_array_value(const struct cf_om_node *node, int reason);
,##__cmpfunc; ,##__cmpfunc;
#define KEY_STRING(__strsize, __eltparser, __cmpfunc...) \ #define KEY_STRING(__strsize, __eltparser, __cmpfunc...) \
,##__cmpfunc; ,##__cmpfunc;
#include "config_schema.h" #include "conf_schema.h"
#undef STRUCT #undef STRUCT
#undef NODE #undef NODE
#undef ATOM #undef ATOM