Commit 93e5c937 authored by Daniel Salzman's avatar Daniel Salzman

conf: remove redundant parametr from include_file

parent 3cc661c4
......@@ -619,10 +619,9 @@ int conf_parse(
conf_t *conf,
knot_db_txn_t *txn,
const char *input,
bool is_file,
void *data)
bool is_file)
{
if (conf == NULL || txn == NULL || input == NULL || data == NULL) {
if (conf == NULL || txn == NULL || input == NULL) {
return KNOT_EINVAL;
}
......@@ -728,10 +727,8 @@ int conf_import(
goto import_error;
}
conf_check_t args = { NULL };
// Parse and import given file.
ret = conf_parse(conf, &txn, input, is_file, &args);
ret = conf_parse(conf, &txn, input, is_file);
if (ret != KNOT_EOK) {
conf->api->txn_abort(&txn);
goto import_error;
......
......@@ -227,7 +227,6 @@ void conf_deactivate_modules(
* \param[in] txn Transaction.
* \param[in] input Configuration string or filename.
* \param[in] is_file Specifies if the input is string or input filename.
* \param[in] data Internal data.
*
* \return Error code, KNOT_EOK if success.
*/
......@@ -235,8 +234,7 @@ int conf_parse(
conf_t *conf,
knot_db_txn_t *txn,
const char *input,
bool is_file,
void *data
bool is_file
);
/*!
......
......@@ -579,8 +579,7 @@ int include_file(
}
// Include regular file.
ret = conf_parse(args->conf, args->txn, glob_buf.gl_pathv[i],
true, args);
ret = conf_parse(args->conf, args->txn, glob_buf.gl_pathv[i], true);
if (ret != KNOT_EOK) {
goto include_error;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment