fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

src/config.c: Add junk callback to config_file_walk()

Browse Source 
This can be used if we care about junk, such as empty lines and
comments. Currently unused since we skip these when parsing
configuration settings. This makes sense if we want to make slight
modifications to the configuration file without losing formatting and
comments, though.

Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
This commit is contained in:
Lukas Fleischer 2012-02-16 10:45:09 +01:00
parent 4c5d6fe612
commit b105bf8fab
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/config.c
View File

@ -39,6 +39,7 @@
#include "calcurse.h" #include "calcurse.h"
typedef int (*config_fn_walk_cb_t) (const char *, const char *, void *); typedef int (*config_fn_walk_cb_t) (const char *, const char *, void *);
typedef int (*config_fn_walk_junk_cb_t) (const char *, void *);
static int static int
config_parse_bool (unsigned *dest, const char *val) config_parse_bool (unsigned *dest, const char *val)
@ -228,7 +229,8 @@ config_set_conf (const char *key, const char *value)
} }
static void static void
config_file_walk (config_fn_walk_cb_t fn_cb, void *data) config_file_walk (config_fn_walk_cb_t fn_cb,
config_fn_walk_junk_cb_t fn_junk_cb, void *data)
{ {
FILE *data_file; FILE *data_file;
char *mesg_line1 = _("Failed to open config file"); char *mesg_line1 = _("Failed to open config file");
@ -253,7 +255,11 @@ config_file_walk (config_fn_walk_cb_t fn_cb, void *data)
io_extract_data (e_conf, buf, sizeof buf); io_extract_data (e_conf, buf, sizeof buf);
if (*e_conf == '\0') if (*e_conf == '\0')
{
if (fn_junk_cb)
fn_junk_cb (buf, data);
continue; continue;
}
key = e_conf; key = e_conf;
value = strchr (e_conf, '='); value = strchr (e_conf, '=');
@ -297,7 +303,7 @@ config_load_cb (const char *key, const char *value, void *dummy)
void void
config_load (void) config_load (void)
{ {
config_file_walk (config_load_cb, NULL); config_file_walk (config_load_cb, NULL, NULL);
} }
/* /*