From a4c11477fee6f77440dc5353595f3c1390f765b5 Mon Sep 17 00:00:00 2001 From: Mauro Sardara Date: Mon, 12 Sep 2022 18:36:10 +0200 Subject: fix(interest_manifest.h): set correct type to pos variable when using it in interest_manifest_foreach_suffix Ref: HICN-780 Signed-off-by: Mauro Sardara Change-Id: I6025c3e87d4d8cb6a1e5e1f68e856214f8aa81ed --- hicn-light/src/hicn/core/forwarder.c | 2 +- hicn-plugin/src/interest_pcslookup_node.c | 2 +- lib/src/test/test_interest_manifest.cc | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hicn-light/src/hicn/core/forwarder.c b/hicn-light/src/hicn/core/forwarder.c index d148f845d..60493a9c5 100644 --- a/hicn-light/src/hicn/core/forwarder.c +++ b/hicn-light/src/hicn/core/forwarder.c @@ -979,7 +979,7 @@ static ssize_t forwarder_process_aggregated_interest( // then just iterate the interest manifest and update the suffix in the name // struct hicn_name_suffix_t *suffix; - int pos; + unsigned long pos; interest_manifest_foreach_suffix(int_manifest_header, suffix, pos) { // Update name hicn_name_set_suffix(&name_copy, *suffix); diff --git a/hicn-plugin/src/interest_pcslookup_node.c b/hicn-plugin/src/interest_pcslookup_node.c index 743227c18..4947b67ff 100644 --- a/hicn-plugin/src/interest_pcslookup_node.c +++ b/hicn-plugin/src/interest_pcslookup_node.c @@ -200,7 +200,7 @@ hicn_interest_manifest_pcslookup_node_inline (vlib_main_t *vm, u32 next0 = HICN_INTEREST_PCSLOOKUP_NEXT_ERROR_DROP; hicn_pcs_entry_t *pcs_entry = NULL; interest_manifest_header_t *int_manifest_header = NULL; - int pos = 0; + unsigned long pos = 0; rt = vlib_node_get_runtime_data (vm, hicn_interest_pcslookup_node.index); diff --git a/lib/src/test/test_interest_manifest.cc b/lib/src/test/test_interest_manifest.cc index da7531fd3..25ac83728 100644 --- a/lib/src/test/test_interest_manifest.cc +++ b/lib/src/test/test_interest_manifest.cc @@ -152,7 +152,7 @@ TEST_F (InterestManifestTest, SerializeDeserialize) EXPECT_THAT (header->n_suffixes, ::testing::Eq (n_suffixes)); int i = 0; - int pos; + unsigned long pos; interest_manifest_foreach_suffix (header, suffix, pos) { if (pos == 0) @@ -169,7 +169,7 @@ TEST_F (InterestManifestTest, SerializeDeserialize) TEST_F (InterestManifestTest, ForEach) { - int pos; + unsigned long pos; hicn_name_suffix_t *suffix = nullptr; auto header = reinterpret_cast (buffer); interest_manifest_init (header, 0); -- cgit