aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Savolainen <petri.savolainen@nokia.com>2019-06-26 13:46:16 +0300
committerPetri Savolainen <petri.savolainen@nokia.com>2019-07-01 13:45:09 +0300
commit94252435db7b5710be849454de3c6028c16fb0b9 (patch)
treeebeacc14f2061e5fb6fef7331fe1c8c6783a1ce3
parent01d0836470d4475db832ae5fe72bfc8b169ad079 (diff)
validation: fix variable may be used uninitialized warnings
Fix compiler warning: "X may be used uninitialized in this function". These warnings were found when building with link time optimization (-flto flag). Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
-rw-r--r--test/validation/api/classification/odp_classification_common.c9
-rw-r--r--test/validation/api/ipsec/ipsec.c24
-rw-r--r--test/validation/api/packet/packet.c18
-rw-r--r--test/validation/api/pktio/pktio.c13
-rw-r--r--test/validation/api/pool/pool.c4
-rw-r--r--test/validation/api/traffic_mngr/traffic_mngr.c19
6 files changed, 63 insertions, 24 deletions
diff --git a/test/validation/api/classification/odp_classification_common.c b/test/validation/api/classification/odp_classification_common.c
index 9b5d8ec0e..80eb9e3c4 100644
--- a/test/validation/api/classification/odp_classification_common.c
+++ b/test/validation/api/classification/odp_classification_common.c
@@ -180,8 +180,15 @@ int parse_ipv4_string(const char *ipaddress, uint32_t *addr, uint32_t *mask)
void enqueue_pktio_interface(odp_packet_t pkt, odp_pktio_t pktio)
{
odp_pktout_queue_t pktout;
+ int ret;
+
+ ret = odp_pktout_queue(pktio, &pktout, 1);
+
+ if (ret != 1) {
+ CU_FAIL_FATAL("No pktout queue");
+ return;
+ }
- CU_ASSERT_FATAL(odp_pktout_queue(pktio, &pktout, 1) == 1);
CU_ASSERT(odp_pktout_send(pktout, &pkt, 1) == 1);
}
diff --git a/test/validation/api/ipsec/ipsec.c b/test/validation/api/ipsec/ipsec.c
index 31776bd29..1b17f082e 100644
--- a/test/validation/api/ipsec/ipsec.c
+++ b/test/validation/api/ipsec/ipsec.c
@@ -398,6 +398,7 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
{
odp_event_t event;
odp_ipsec_status_t status;
+ int ret;
CU_ASSERT_EQUAL(IPSEC_SA_CTX, odp_ipsec_sa_context(sa));
@@ -410,12 +411,15 @@ void ipsec_sa_destroy(odp_ipsec_sa_t sa)
CU_ASSERT_EQUAL(ODP_EVENT_IPSEC_STATUS, odp_event_type(event));
- CU_ASSERT_EQUAL(ODP_IPSEC_OK, odp_ipsec_status(&status, event));
+ ret = odp_ipsec_status(&status, event);
+ CU_ASSERT(ret == 0);
- CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id);
- CU_ASSERT_EQUAL(sa, status.sa);
- CU_ASSERT_EQUAL(0, status.result);
- CU_ASSERT_EQUAL(0, status.warn.all);
+ if (ret == 0) {
+ CU_ASSERT_EQUAL(ODP_IPSEC_STATUS_SA_DISABLE, status.id);
+ CU_ASSERT_EQUAL(sa, status.sa);
+ CU_ASSERT_EQUAL(0, status.result);
+ CU_ASSERT_EQUAL(0, status.warn.all);
+ }
odp_event_free(event);
}
@@ -570,11 +574,13 @@ static int ipsec_send_in_one(const ipsec_test_part *part,
ODP_EVENT_PACKET_IPSEC);
}
} else {
- odp_queue_t queue;
odp_pktout_queue_t pktout;
+ odp_queue_t queue = ODP_QUEUE_INVALID;
- CU_ASSERT_EQUAL_FATAL(1, odp_pktout_queue(suite_context.pktio,
- &pktout, 1));
+ if (odp_pktout_queue(suite_context.pktio, &pktout, 1) != 1) {
+ CU_FAIL_FATAL("No pktout queue");
+ return 0;
+ }
CU_ASSERT_EQUAL(1, odp_pktout_send(pktout, &pkt, 1));
CU_ASSERT_EQUAL_FATAL(1,
@@ -662,9 +668,9 @@ static int ipsec_send_out_one(const ipsec_test_part *part,
}
} else {
struct odp_ipsec_out_inline_param_t inline_param;
- odp_queue_t queue;
uint32_t hdr_len;
uint8_t hdr[32];
+ odp_queue_t queue = ODP_QUEUE_INVALID;
if (NULL != part->out[0].pkt_out) {
hdr_len = part->out[0].pkt_out->l3_offset;
diff --git a/test/validation/api/packet/packet.c b/test/validation/api/packet/packet.c
index 0f019f6c9..352fa62c9 100644
--- a/test/validation/api/packet/packet.c
+++ b/test/validation/api/packet/packet.c
@@ -85,13 +85,16 @@ static void _packet_compare_data(odp_packet_t pkt1, odp_packet_t pkt2,
uint32_t len = odp_packet_len(pkt1);
uint32_t offset = 0;
uint32_t seglen1, seglen2, cmplen;
+ void *pkt1map, *pkt2map;
int ret;
CU_ASSERT_FATAL(len == odp_packet_len(pkt2));
while (len > 0) {
- void *pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL);
- void *pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL);
+ seglen1 = 0;
+ seglen2 = 0;
+ pkt1map = odp_packet_offset(pkt1, offset, &seglen1, NULL);
+ pkt2map = odp_packet_offset(pkt2, offset, &seglen2, NULL);
CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map);
CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map);
@@ -787,7 +790,7 @@ static void packet_test_layer_offsets(void)
{
odp_packet_t pkt = test_packet;
uint8_t *l2_addr, *l3_addr, *l4_addr;
- uint32_t seg_len;
+ uint32_t seg_len = 0;
const uint32_t l2_off = 2;
const uint32_t l3_off = l2_off + 14;
const uint32_t l4_off = l3_off + 14;
@@ -1342,6 +1345,7 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1,
odp_packet_t pkt2, uint32_t off2,
uint32_t len, int line)
{
+ void *pkt1map, *pkt2map;
uint32_t seglen1, seglen2, cmplen;
int ret;
@@ -1350,8 +1354,10 @@ static void _packet_compare_offset(odp_packet_t pkt1, uint32_t off1,
return;
while (len > 0) {
- void *pkt1map = odp_packet_offset(pkt1, off1, &seglen1, NULL);
- void *pkt2map = odp_packet_offset(pkt2, off2, &seglen2, NULL);
+ seglen1 = 0;
+ seglen2 = 0;
+ pkt1map = odp_packet_offset(pkt1, off1, &seglen1, NULL);
+ pkt2map = odp_packet_offset(pkt2, off2, &seglen2, NULL);
CU_ASSERT_PTR_NOT_NULL_FATAL(pkt1map);
CU_ASSERT_PTR_NOT_NULL_FATAL(pkt2map);
@@ -2221,9 +2227,9 @@ static void packet_test_offset(void)
{
odp_packet_t pkt = test_packet;
uint32_t seg_len, full_seg_len;
- odp_packet_seg_t seg;
uint8_t *ptr, *start_ptr;
uint32_t offset;
+ odp_packet_seg_t seg = ODP_PACKET_SEG_INVALID;
ptr = odp_packet_offset(pkt, 0, &seg_len, &seg);
CU_ASSERT(seg != ODP_PACKET_SEG_INVALID);
diff --git a/test/validation/api/pktio/pktio.c b/test/validation/api/pktio/pktio.c
index 15f58e95a..ae7ccbb6b 100644
--- a/test/validation/api/pktio/pktio.c
+++ b/test/validation/api/pktio/pktio.c
@@ -550,12 +550,18 @@ static int get_packets(pktio_info_t *pktio_rx, odp_packet_t pkt_tbl[],
odp_event_t evt_tbl[num];
int num_evts = 0;
int num_pkts = 0;
- int i;
+ int i, ret;
if (pktio_rx->in_mode == ODP_PKTIN_MODE_DIRECT) {
odp_pktin_queue_t pktin;
- CU_ASSERT_FATAL(odp_pktin_queue(pktio_rx->id, &pktin, 1) == 1);
+ ret = odp_pktin_queue(pktio_rx->id, &pktin, 1);
+
+ if (ret != 1) {
+ CU_FAIL_FATAL("No pktin queues");
+ return -1;
+ }
+
return odp_pktin_recv(pktin, pkt_tbl, num);
}
@@ -837,7 +843,7 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts,
/* create pktios and associate input/output queues */
for (i = 0; i < num_ifaces; ++i) {
odp_pktout_queue_t pktout;
- odp_queue_t queue;
+ odp_queue_t queue = ODP_QUEUE_INVALID;
odp_pktout_mode_t out_mode = ODP_PKTOUT_MODE_DIRECT;
if (mode == TXRX_MODE_MULTI_EVENT)
@@ -859,7 +865,6 @@ static void test_txrx(odp_pktin_mode_t in_mode, int num_pkts,
CU_ASSERT_FATAL(odp_pktout_queue(io->id,
&pktout, 1) == 1);
io->pktout = pktout;
- queue = ODP_QUEUE_INVALID;
}
io->queue_out = queue;
diff --git a/test/validation/api/pool/pool.c b/test/validation/api/pool/pool.c
index 0dbdd0ddf..c3def1b05 100644
--- a/test/validation/api/pool/pool.c
+++ b/test/validation/api/pool/pool.c
@@ -216,6 +216,7 @@ static void pool_test_info_packet(void)
pool = odp_pool_create(pool_name, &param);
CU_ASSERT_FATAL(pool != ODP_POOL_INVALID);
+ memset(&info, 0, sizeof(odp_pool_info_t));
CU_ASSERT_FATAL(odp_pool_info(pool, &info) == 0);
CU_ASSERT(strncmp(pool_name, info.name, sizeof(pool_name)) == 0);
@@ -262,7 +263,8 @@ static void pool_test_info_data_range(void)
for (i = 0; i < num; i++) {
uintptr_t pkt_data, pkt_data_end;
- uint32_t offset = 0, seg_len;
+ uint32_t offset = 0;
+ uint32_t seg_len = 0;
uint32_t pkt_len = odp_packet_len(pkt[i]);
while (offset < pkt_len) {
diff --git a/test/validation/api/traffic_mngr/traffic_mngr.c b/test/validation/api/traffic_mngr/traffic_mngr.c
index 9b9e73b71..f18957d24 100644
--- a/test/validation/api/traffic_mngr/traffic_mngr.c
+++ b/test/validation/api/traffic_mngr/traffic_mngr.c
@@ -648,8 +648,9 @@ static int get_ip_tos(odp_packet_t odp_pkt, uint8_t *tos_ptr)
{
odph_ipv4hdr_t *ipv4_hdr;
odph_ipv6hdr_t *ipv6_hdr;
- uint32_t hdr_len, ver_tc_flow;
+ uint32_t ver_tc_flow;
uint8_t tos, tc;
+ uint32_t hdr_len = 0;
if (odp_packet_has_ipv4(odp_pkt)) {
ipv4_hdr = odp_packet_l3_ptr(odp_pkt, &hdr_len);
@@ -2243,6 +2244,7 @@ static void check_threshold_profile(char *threshold_name,
{
odp_tm_threshold_params_t threshold_params;
odp_tm_threshold_t profile;
+ int ret;
profile = odp_tm_thresholds_lookup(threshold_name);
CU_ASSERT(profile != ODP_TM_INVALID);
@@ -2251,7 +2253,12 @@ static void check_threshold_profile(char *threshold_name,
if (profile == threshold_profiles[threshold_idx - 1])
return;
- odp_tm_thresholds_params_read(profile, &threshold_params);
+ ret = odp_tm_thresholds_params_read(profile, &threshold_params);
+ CU_ASSERT(ret == 0);
+
+ if (ret)
+ return;
+
CU_ASSERT(threshold_params.max_pkts ==
threshold_idx * MIN_PKT_THRESHOLD);
CU_ASSERT(threshold_params.max_bytes ==
@@ -2307,6 +2314,7 @@ static void check_wred_profile(char *wred_name,
{
odp_tm_wred_params_t wred_params;
odp_tm_wred_t profile;
+ int ret;
profile = odp_tm_wred_lookup(wred_name);
CU_ASSERT(profile != ODP_TM_INVALID);
@@ -2314,7 +2322,12 @@ static void check_wred_profile(char *wred_name,
if (profile != wred_profiles[wred_idx - 1][color])
return;
- odp_tm_wred_params_read(profile, &wred_params);
+ ret = odp_tm_wred_params_read(profile, &wred_params);
+ CU_ASSERT(ret == 0);
+
+ if (ret)
+ return;
+
CU_ASSERT(wred_params.min_threshold == wred_idx * MIN_WRED_THRESH);
CU_ASSERT(wred_params.med_threshold == wred_idx * MED_WRED_THRESH);
CU_ASSERT(wred_params.med_drop_prob == wred_idx * MED_DROP_PROB);