diff --git a/merge-recursive.c b/merge-recursive.c
index c292a77a81d137a3ee73111162c9aa515c975d70..34e3167cafc3d09e1a2b32bc9a5c64b4de1e442d 100644 (file)
--- a/merge-recursive.c
+++ b/merge-recursive.c
int namelen;
if (!strcmp(var, "merge.default")) {
int namelen;
if (!strcmp(var, "merge.default")) {
- if (value)
- default_ll_merge = strdup(value);
+ if (!value)
+ return config_error_nonbool(var);
+ default_ll_merge = strdup(value);
return 0;
}
return 0;
}
if (!strcmp("name", ep)) {
if (!value)
if (!strcmp("name", ep)) {
if (!value)
- return error("%s: lacks value", var);
+ return config_error_nonbool(var);
fn->description = strdup(value);
return 0;
}
if (!strcmp("driver", ep)) {
if (!value)
fn->description = strdup(value);
return 0;
}
if (!strcmp("driver", ep)) {
if (!value)
- return error("%s: lacks value", var);
+ return config_error_nonbool(var);
/*
* merge.<name>.driver specifies the command line:
*
/*
* merge.<name>.driver specifies the command line:
*
if (!strcmp("recursive", ep)) {
if (!value)
if (!strcmp("recursive", ep)) {
if (!value)
- return error("%s: lacks value", var);
+ return config_error_nonbool(var);
fn->recursive = strdup(value);
return 0;
}
fn->recursive = strdup(value);
return 0;
}