Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session: cleanup use of api_client_index
[vpp.git]
/
src
/
vcl
/
vcl_cfg.c
diff --git
a/src/vcl/vcl_cfg.c
b/src/vcl/vcl_cfg.c
index
e39e517
..
402bb91
100644
(file)
--- a/
src/vcl/vcl_cfg.c
+++ b/
src/vcl/vcl_cfg.c
@@
-22,6
+22,7
@@
static vppcom_main_t _vppcom_main = {
.debug = VPPCOM_DEBUG_INIT,
.is_init = 0,
static vppcom_main_t _vppcom_main = {
.debug = VPPCOM_DEBUG_INIT,
.is_init = 0,
+ .app_index = ~0,
.my_client_index = ~0
};
.my_client_index = ~0
};
@@
-170,6
+171,7
@@
vppcom_cfg_heapsize (char *conf_fname)
goto defaulted;
}
}
goto defaulted;
}
}
+ free (argv[i]);
}
defaulted:
}
defaulted:
@@
-231,8
+233,7
@@
vppcom_cfg_read_file (char *conf_fname)
if (fstat (fd, &s) < 0)
{
if (fstat (fd, &s) < 0)
{
- VCFG_DBG (0,
- "VCL<%d>: failed to stat `%s', using default configuration",
+ VCFG_DBG (0, "VCL<%d>: failed to stat `%s' using default configuration",
getpid (), conf_fname);
goto file_done;
}
getpid (), conf_fname);
goto file_done;
}
@@
-254,17
+255,21
@@
vppcom_cfg_read_file (char *conf_fname)
if (unformat (line_input, "vcl {"))
{
vc_cfg_input = 1;
if (unformat (line_input, "vcl {"))
{
vc_cfg_input = 1;
+ unformat_free (line_input);
continue;
}
if (vc_cfg_input)
{
continue;
}
if (vc_cfg_input)
{
- if (unformat (line_input, "heapsize %lu", &vcl_cfg->heapsize))
+ if (unformat (line_input, "heapsize %U", unformat_memory_size,
+ &vcl_cfg->heapsize))
{
VCFG_DBG (0, "VCL<%d>: configured heapsize %lu", getpid (),
vcl_cfg->heapsize);
}
{
VCFG_DBG (0, "VCL<%d>: configured heapsize %lu", getpid (),
vcl_cfg->heapsize);
}
- if (unformat (line_input, "max-workers %u", &vcl_cfg->max_workers))
+ else
+ if (unformat
+ (line_input, "max-workers %u", &vcl_cfg->max_workers))
{
VCFG_DBG (0, "VCL<%d>: configured max-workers %u", getpid (),
vcl_cfg->max_workers);
{
VCFG_DBG (0, "VCL<%d>: configured max-workers %u", getpid (),
vcl_cfg->max_workers);
@@
-490,6
+495,7
@@
vppcom_cfg_read_file (char *conf_fname)
vc_cfg_input = 0;
VCFG_DBG (0, "VCL<%d>: completed parsing vppcom config!",
getpid ());
vc_cfg_input = 0;
VCFG_DBG (0, "VCL<%d>: completed parsing vppcom config!",
getpid ());
+ unformat_free (line_input);
goto input_done;
}
else
goto input_done;
}
else
@@
-501,6
+507,7
@@
vppcom_cfg_read_file (char *conf_fname)
&line_input->buffer[line_input->index]);
}
}
&line_input->buffer[line_input->index]);
}
}
+ unformat_free (line_input);
}
}
}
}