diff options
| author |   Florin Coras <fcoras@cisco.com> | 2019-07-28 10:25:40 -0700 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-07-29 20:46:32 +0000 |
| commit | 1a3d2370b53bcdb13581d8be0d9410974b9966c3 (patch) | |
| tree | 97b41ccf26a4b03a4cf8ce805bf7422016f7c764 /src/vcl/vcl_cfg.c | |
| parent | bb2e5221a72911bc52be178cfdd22be0ba1b1ca8 (diff) | |
vcl: fix config parsing of hex values
Type:fix
Change-Id: I31f35dd86fb6efb04d4a449f7fc834296baaa043
Signed-off-by: Tal Saiag <tal.saiag@gmail.com>
Signed-off-by: Florin Coras <fcoras@cisco.com>
Diffstat (limited to 'src/vcl/vcl_cfg.c')
| -rw-r--r-- | src/vcl/vcl_cfg.c | 47 |
1 files changed, 23 insertions, 24 deletions
diff --git a/src/vcl/vcl_cfg.c b/src/vcl/vcl_cfg.c index 5d64515ce51..21fa0fad2b0 100644 --- a/src/vcl/vcl_cfg.c +++ b/src/vcl/vcl_cfg.c @@ -343,84 +343,84 @@ vppcom_cfg_read_file (char *conf_fname) getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } - else if (unformat (line_input, "segment-size %d", + else if (unformat (line_input, "segment-size %u", &vcl_cfg->segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured segment_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured segment_size %u (0x%x)", getpid (), vcl_cfg->segment_size, vcl_cfg->segment_size); } else if (unformat (line_input, "add-segment-size 0x%x", &vcl_cfg->add_segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured add_segment_size 0x%x (%u)", getpid (), vcl_cfg->add_segment_size, vcl_cfg->add_segment_size); } - else if (unformat (line_input, "add-segment-size %d", + else if (unformat (line_input, "add-segment-size %u", &vcl_cfg->add_segment_size)) { - VCFG_DBG (0, "VCL<%d>: configured add_segment_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured add_segment_size %u (0x%x)", getpid (), vcl_cfg->add_segment_size, vcl_cfg->add_segment_size); } - else if (unformat (line_input, "preallocated-fifo-pairs %d", + else if (unformat (line_input, "preallocated-fifo-pairs %u", &vcl_cfg->preallocated_fifo_pairs)) { - VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %d " + VCFG_DBG (0, "VCL<%d>: configured preallocated_fifo_pairs %u " "(0x%x)", getpid (), vcl_cfg->preallocated_fifo_pairs, vcl_cfg->preallocated_fifo_pairs); } - else if (unformat (line_input, "rx-fifo-size 0x%lx", + else if (unformat (line_input, "rx-fifo-size 0x%x", &vcl_cfg->rx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size 0x%x (%u)", getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } - else if (unformat (line_input, "rx-fifo-size %d", + else if (unformat (line_input, "rx-fifo-size %u", &vcl_cfg->rx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured rx_fifo_size %u (0x%x)", getpid (), vcl_cfg->rx_fifo_size, vcl_cfg->rx_fifo_size); } - else if (unformat (line_input, "tx-fifo-size 0x%lx", + else if (unformat (line_input, "tx-fifo-size 0x%x", &vcl_cfg->tx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size 0x%x (%u)", getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } - else if (unformat (line_input, "tx-fifo-size %ld", + else if (unformat (line_input, "tx-fifo-size %u", &vcl_cfg->tx_fifo_size)) { - VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured tx_fifo_size %u (0x%x)", getpid (), vcl_cfg->tx_fifo_size, vcl_cfg->tx_fifo_size); } - else if (unformat (line_input, "event-queue-size 0x%lx", + else if (unformat (line_input, "event-queue-size 0x%x", &vcl_cfg->event_queue_size)) { - VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%d)", + VCFG_DBG (0, "VCL<%d>: configured event_queue_size 0x%x (%u)", getpid (), vcl_cfg->event_queue_size, vcl_cfg->event_queue_size); } - else if (unformat (line_input, "event-queue-size %ld", + else if (unformat (line_input, "event-queue-size %u", &vcl_cfg->event_queue_size)) { - VCFG_DBG (0, "VCL<%d>: configured event_queue_size %d (0x%x)", + VCFG_DBG (0, "VCL<%d>: configured event_queue_size %u (0x%x)", getpid (), vcl_cfg->event_queue_size, vcl_cfg->event_queue_size); } - else if (unformat (line_input, "listen-queue-size 0x%lx", + else if (unformat (line_input, "listen-queue-size 0x%x", &vcl_cfg->listen_queue_size)) { VCFG_DBG (0, "VCL<%d>: configured listen_queue_size 0x%x (%u)", getpid (), vcl_cfg->listen_queue_size, vcl_cfg->listen_queue_size); } - else if (unformat (line_input, "listen-queue-size %ld", + else if (unformat (line_input, "listen-queue-size %u", &vcl_cfg->listen_queue_size)) { VCFG_DBG (0, "VCL<%d>: configured listen_queue_size %u (0x%x)", @@ -472,9 +472,8 @@ vppcom_cfg_read_file (char *conf_fname) else if (unformat (line_input, "namespace-secret %lu", &vcl_cfg->namespace_secret)) { - VCFG_DBG (0, - "VCL<%d>: configured namespace_secret %llu (0x%llx)", - getpid (), + VCFG_DBG (0, "VCL<%d>: configured namespace_secret %llu " + "(0x%llx)", getpid (), (unsigned long long) vcl_cfg->namespace_secret, (unsigned long long) vcl_cfg->namespace_secret); } |