summaryrefslogtreecommitdiffstats
path: root/ini/ini_configobj.c
diff options
context:
space:
mode:
authorDmitri Pal <dpal@redhat.com>2010-08-02 21:44:15 -0400
committerStephen Gallagher <sgallagh@redhat.com>2010-09-22 14:57:53 -0400
commita54a8e53a97d104490966e36d40e9b0b419ad050 (patch)
tree0bffb1517c4daaa645a917d1938e067a44696322 /ini/ini_configobj.c
parentfbaa3ff3a5e45bffea373d0bea4ccd206db37a45 (diff)
downloadding-libs-a54a8e53a97d104490966e36d40e9b0b419ad050.tar.gz
ding-libs-a54a8e53a97d104490966e36d40e9b0b419ad050.tar.xz
ding-libs-a54a8e53a97d104490966e36d40e9b0b419ad050.zip
Introducing configuration file object
The patch contains two major pieces of work: * The beginning of the new INI interface significantly re-thought and reworked. * The implementation of the file object. Parsing was adjusted to use this object.
Diffstat (limited to 'ini/ini_configobj.c')
-rw-r--r--ini/ini_configobj.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/ini/ini_configobj.c b/ini/ini_configobj.c
index e75f093..4da9a7c 100644
--- a/ini/ini_configobj.c
+++ b/ini/ini_configobj.c
@@ -57,7 +57,7 @@ void ini_cleanup_cb(const char *property,
}
/* Traverse the collection and clean the object */
-void ini_config_destroy(struct configobj *ini_config)
+void ini_config_destroy(struct ini_cfgobj *ini_config)
{
TRACE_FLOW_ENTRY();
@@ -75,10 +75,10 @@ void ini_config_destroy(struct configobj *ini_config)
}
/* Create a config object */
-int ini_config_create(struct configobj **ini_config)
+int ini_config_create(struct ini_cfgobj **ini_config)
{
int error = EOK;
- struct configobj *new_co = NULL;
+ struct ini_cfgobj *new_co = NULL;
TRACE_FLOW_ENTRY();
@@ -88,7 +88,7 @@ int ini_config_create(struct configobj **ini_config)
}
errno = 0;
- new_co = malloc(sizeof(struct configobj));
+ new_co = malloc(sizeof(struct ini_cfgobj));
if (!new_co) {
error = errno;
TRACE_ERROR_NUMBER("Failed to allocate memory", ENOMEM);
@@ -96,6 +96,7 @@ int ini_config_create(struct configobj **ini_config)
}
new_co->cfg = NULL;
+ new_co->boundary = INI_WRAP_BOUNDARY;
/* Create a collection to hold configuration data */
error = col_create_collection(&(new_co->cfg),