projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes to make build work after merging.
[trust_router.git]
/
tr
/
tr_main.c
diff --git
a/tr/tr_main.c
b/tr/tr_main.c
index
9de6ad0
..
98aa2bb
100644
(file)
--- a/
tr/tr_main.c
+++ b/
tr/tr_main.c
@@
-244,7
+244,6
@@
int main (int argc, const char *argv[])
{
TR_INSTANCE *tr = NULL;
struct dirent **cfg_files = NULL;
{
TR_INSTANCE *tr = NULL;
struct dirent **cfg_files = NULL;
- json_t *jcfg = NULL;
TR_CFG_RC rc = TR_CFG_SUCCESS; /* presume success */
int err = 0, n = 0;;
TR_CFG_RC rc = TR_CFG_SUCCESS; /* presume success */
int err = 0, n = 0;;
@@
-262,7
+261,7
@@
int main (int argc, const char *argv[])
exit(1);
}
exit(1);
}
- if (TR_CFG_SUCCESS != tr_parse_config(tr, cfg_files)) {
+ if (TR_CFG_SUCCESS != tr_parse_config(tr,
n,
cfg_files)) {
fprintf (stderr, "Error decoding configuration information, exiting.\n");
exit(1);
}
fprintf (stderr, "Error decoding configuration information, exiting.\n");
exit(1);
}