aboutsummaryrefslogtreecommitdiffstats
path: root/vppinfra
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2016-08-04 18:58:05 -0400
committerFlorin Coras <florin.coras@gmail.com>2016-08-05 13:21:59 +0000
commit56faee837281c7f9c28aa40dbf0f6e4620b76be8 (patch)
tree9fc45d3dca2bda5ff6c168fd943a9a6a55d0d2ab /vppinfra
parent91c7d387fbfdf109f422c56ec5a4a21c9bbd9d02 (diff)
VPP-189 Clean up more coverity warnings
Change-Id: I1b971ab326dc334a4743fd7d4184cef106b0523d Signed-off-by: Dave Barach <dave@barachs.net>
Diffstat (limited to 'vppinfra')
-rw-r--r--vppinfra/vppinfra/elf.c15
-rw-r--r--vppinfra/vppinfra/phash.c7
2 files changed, 21 insertions, 1 deletions
diff --git a/vppinfra/vppinfra/elf.c b/vppinfra/vppinfra/elf.c
index 8a09cd41fe0..7fe3048b4c7 100644
--- a/vppinfra/vppinfra/elf.c
+++ b/vppinfra/vppinfra/elf.c
@@ -1107,6 +1107,8 @@ static void byte_swap_verneed (elf_main_t * em,
}
static void
+set_dynamic_verneed (elf_main_t * em) __attribute__((unused));
+static void
set_dynamic_verneed (elf_main_t * em)
{
elf_dynamic_version_need_union_t * vus = em->verneed;
@@ -1123,6 +1125,8 @@ set_dynamic_verneed (elf_main_t * em)
}
static void
+set_symbol_table (elf_main_t * em, u32 table_index) __attribute__((unused));
+static void
set_symbol_table (elf_main_t * em, u32 table_index)
{
elf_symbol_table_t * tab = vec_elt_at_index (em->symbol_tables, table_index);
@@ -1376,12 +1380,16 @@ static u32 string_table_add_name (string_table_builder_t * b, u8 * n)
}
static u32 string_table_add_name_index (string_table_builder_t * b, u32 index)
+ __attribute__((unused));
+static u32 string_table_add_name_index (string_table_builder_t * b, u32 index)
{
u8 * n = b->old_table + index;
return string_table_add_name (b, n);
}
static void string_table_init (string_table_builder_t * b, u8 * old_table)
+ __attribute__((unused));
+static void string_table_init (string_table_builder_t * b, u8 * old_table)
{
memset (b, 0, sizeof (b[0]));
b->old_table = old_table;
@@ -1389,6 +1397,8 @@ static void string_table_init (string_table_builder_t * b, u8 * old_table)
}
static u8 * string_table_done (string_table_builder_t * b)
+ __attribute__((unused));
+static u8 * string_table_done (string_table_builder_t * b)
{
hash_free (b->hash);
return b->new_table;
@@ -1400,6 +1410,8 @@ static void layout_sections (elf_main_t * em)
u32 n_sections_with_changed_exec_address = 0;
u32 * deferred_symbol_and_string_sections = 0;
u32 n_deleted_sections = 0;
+ /* note: rebuild is always zero. Intent lost in the sands of time */
+#if 0
int rebuild = 0;
/* Re-build section string table (sections may have been deleted). */
@@ -1498,6 +1510,7 @@ static void layout_sections (elf_main_t * em)
vec_free (s->contents);
s->contents = string_table_done (&b);
}
+#endif /* dead code */
/* Figure file offsets and exec addresses for sections. */
{
@@ -1613,8 +1626,10 @@ static void layout_sections (elf_main_t * em)
/* Update dynamic entries now that sections have been assigned
possibly new addresses. */
+#if 0
if (rebuild)
elf_set_dynamic_entries (em);
+#endif
/* Update segments for changed section addresses. */
{
diff --git a/vppinfra/vppinfra/phash.c b/vppinfra/vppinfra/phash.c
index c883fac871e..a104e64e1be 100644
--- a/vppinfra/vppinfra/phash.c
+++ b/vppinfra/vppinfra/phash.c
@@ -662,7 +662,12 @@ static void guess_initial_parameters (phash_main_t * pm)
a_max = 1;
b_max = 1;
case 1: case 2: case 3: case 4: case 5: case 6: case 7: case 8:
- a_max = is_minimal ? s_max / 2 : s_max;
+ /*
+ * Was: a_max = is_minimal ? s_max / 2 : s_max;
+ * However, we know that is_minimal must be true, so the
+ * if-arm of the ternary expression is always executed.
+ */
+ a_max = s_max/2;
b_max = s_max/2;
break;
case 9: case 10: case 11: case 12: case 13: