summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2014-08-13 07:24:21 +0200
committerJeremy Allison <jra@samba.org>2014-08-14 21:27:13 +0200
commited66a984bf57d2f8a5bab86cd3c73e2430e301ef (patch)
treec47c17968071d873ad54b2fc0419f2b7af0b6fae
parent63acc8e81082e7c90e84af3264a0a89e338b58a2 (diff)
downloadsamba-ed66a984bf57d2f8a5bab86cd3c73e2430e301ef.tar.gz
samba-ed66a984bf57d2f8a5bab86cd3c73e2430e301ef.tar.xz
samba-ed66a984bf57d2f8a5bab86cd3c73e2430e301ef.zip
Use tini in preference.
Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Jeremy Allison <jra@samba.org>
-rw-r--r--lib/util/params.c28
1 files changed, 28 insertions, 0 deletions
diff --git a/lib/util/params.c b/lib/util/params.c
index 3f1d535999..82c6e896b6 100644
--- a/lib/util/params.c
+++ b/lib/util/params.c
@@ -80,6 +80,7 @@
#include "includes.h"
#include "system/locale.h"
+#include "tini.h"
/* -------------------------------------------------------------------------- **
* Constants...
@@ -521,6 +522,8 @@ static myFILE *OpenConfFile(TALLOC_CTX *mem_ctx, const char *FileName )
return( ret );
} /* OpenConfFile */
+#if 0
+
bool pm_process( const char *FileName,
bool (*sfunc)(const char *, void *),
bool (*pfunc)(const char *, const char *, void *),
@@ -579,4 +582,29 @@ bool pm_process( const char *FileName,
return( true ); /* Generic success. */
} /* pm_process */
+#else
+
/* -------------------------------------------------------------------------- */
+
+bool pm_process(const char *filename,
+ bool (*sfunc)(const char *section, void *private_data),
+ bool (*pfunc)(const char *name, const char *value,
+ void *private_data),
+ void *private_data)
+{
+ FILE *f;
+ bool ret;
+
+ f = fopen(filename, "r");
+ if (f == NULL) {
+ return false;
+ }
+
+ ret = tini_parse(f, sfunc, pfunc, private_data);
+
+ fclose(f);
+
+ return ret;
+}
+
+#endif