summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2016-04-26 19:30:36 +0200
committerDave Barach <openvpp@barachs.net>2016-04-26 19:35:12 +0000
commitfa6935594d61f7dbd1af61f684139eeb8b1b59e5 (patch)
tree3040af11745c2958619880bb4971d688067972ca
parentf2ba9aadbb627dfdf99c0a13e9dbf9fc0b15cb20 (diff)
Fix clang warnings in api code
Change-Id: I7a4bc4678fea723c35bbeac1b893c5c52235aa67 Signed-off-by: Damjan Marion <damarion@cisco.com>
-rw-r--r--vpp-api-test/vat/api_format.c14
-rw-r--r--vpp-api/java/japi/vppjni.c12
2 files changed, 13 insertions, 13 deletions
diff --git a/vpp-api-test/vat/api_format.c b/vpp-api-test/vat/api_format.c
index 29629c91915..ed96af71a4c 100644
--- a/vpp-api-test/vat/api_format.c
+++ b/vpp-api-test/vat/api_format.c
@@ -2481,7 +2481,7 @@ static int dump_ip_table (vat_main_t * vam, int is_ipv6)
"%-12s\n",
"sw_if_index");
- if (0 == vam->ip_details_by_sw_if_index) {
+ if (0 == vam) {
return 0;
}
@@ -2879,31 +2879,31 @@ int api_sw_interface_dump (vat_main_t * vam)
/* Get list of ethernets */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter)-1);
S;
/* and local / loopback interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1);
S;
/* and vxlan tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter)-1);
S;
/* and host (af_packet) interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter)-1);
S;
/* and l2tpv3 tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "l2tpv3_tunnel", sizeof(mp->name_filter)-1);
S;
/* Use a control ping for synchronization */
@@ -6906,7 +6906,7 @@ static int api_l2tpv3_set_lookup_key (vat_main_t * vam)
break;
}
- if (key == ~0) {
+ if (key == (u8) ~0) {
errmsg ("l2tp session lookup key unset\n");
return -99;
}
diff --git a/vpp-api/java/japi/vppjni.c b/vpp-api/java/japi/vppjni.c
index adbc631f79c..c3a1078b7b7 100644
--- a/vpp-api/java/japi/vppjni.c
+++ b/vpp-api/java/japi/vppjni.c
@@ -128,38 +128,38 @@ static int sw_interface_dump (vppjni_main_t * jm)
/* Get list of ethernets */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "Ether", sizeof(mp->name_filter)-1);
S;
/* and local / loopback interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "lo", sizeof(mp->name_filter)-1);
S;
/* and vxlan tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "vxlan", sizeof(mp->name_filter)-1);
S;
/* and tap tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "tap", sizeof(mp->name_filter)-1);
S;
/* and host (af_packet) interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
- strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter-1));
+ strncpy ((char *) mp->name_filter, "host", sizeof(mp->name_filter)-1);
S;
/* and l2tpv3 tunnel interfaces */
M(SW_INTERFACE_DUMP, sw_interface_dump);
mp->name_filter_valid = 1;
strncpy ((char *) mp->name_filter, "l2tpv3_tunnel",
- sizeof(mp->name_filter-1));
+ sizeof(mp->name_filter)-1);
S;
/* Use a control ping for synchronization */