summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonatas Abraitis <donatas@opensourcerouting.org>2023-09-29 09:17:56 +0300
committerDonatas Abraitis <donatas@opensourcerouting.org>2023-09-29 10:24:16 +0300
commit02d8b80ce4cc4a741ac796df453668b43b3e5d0f (patch)
treed239cb951d40fb8da5e1402863719660d5b55be6
parentc323b930eaeb779a973e95b1202223164a5e2b02 (diff)
*: Do not cast to the same type as the destination is
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
-rw-r--r--bgpd/bgp_evpn_vty.c16
-rw-r--r--bgpd/bgp_linkstate_tlv.c5
-rw-r--r--lib/darr.c2
-rw-r--r--lib/if.c4
-rw-r--r--lib/link_state.c6
-rw-r--r--ospf6d/ospf6_gr_helper.c4
-rw-r--r--sharpd/sharp_vty.c2
-rw-r--r--zebra/tc_netlink.c6
8 files changed, 22 insertions, 23 deletions
diff --git a/bgpd/bgp_evpn_vty.c b/bgpd/bgp_evpn_vty.c
index e4c7fdb124..eb9f34ef02 100644
--- a/bgpd/bgp_evpn_vty.c
+++ b/bgpd/bgp_evpn_vty.c
@@ -2687,16 +2687,16 @@ static void evpn_show_route_vni_macip(struct vty *vty, struct bgp *bgp,
*/
if (is_evpn_prefix_ipaddr_none(evp)) {
/* VNI MAC -> Global */
- evpn_type2_prefix_global_copy(
- (struct prefix_evpn *)&tmp_p, evp,
- NULL /* mac */,
- evpn_type2_path_info_get_ip(pi));
+ evpn_type2_prefix_global_copy(&tmp_p, evp,
+ NULL /* mac */,
+ evpn_type2_path_info_get_ip(
+ pi));
} else {
/* VNI IP -> Global */
- evpn_type2_prefix_global_copy(
- (struct prefix_evpn *)&tmp_p, evp,
- evpn_type2_path_info_get_mac(pi),
- NULL /* ip */);
+ evpn_type2_prefix_global_copy(&tmp_p, evp,
+ evpn_type2_path_info_get_mac(
+ pi),
+ NULL /* ip */);
}
route_vty_out_detail(vty, bgp, dest, (struct prefix *)&tmp_p,
diff --git a/bgpd/bgp_linkstate_tlv.c b/bgpd/bgp_linkstate_tlv.c
index 3669d68b85..fbec96a907 100644
--- a/bgpd/bgp_linkstate_tlv.c
+++ b/bgpd/bgp_linkstate_tlv.c
@@ -1066,10 +1066,9 @@ static void bgp_linkstate_tlv_sid_display(struct vty *vty, uint8_t *pnt,
/* IS-IS System-ID */
if (json)
json_object_string_addf(json_data, "neighborId",
- "%pSY\n",
- (uint8_t *)pnt);
+ "%pSY\n", pnt);
else
- vty_out(vty, "%pSY\n", (uint8_t *)pnt);
+ vty_out(vty, "%pSY\n", pnt);
pnt += 6;
}
}
diff --git a/lib/darr.c b/lib/darr.c
index 2c8b7b8778..f0ef5c90be 100644
--- a/lib/darr.c
+++ b/lib/darr.c
@@ -109,6 +109,6 @@ void *__darr_insert_n(void *a, uint at, uint count, size_t esize, bool zero)
memset(_a_at(at), 0, esize * count);
}
- return (void *)a;
+ return a;
#undef _a_at
}
diff --git a/lib/if.c b/lib/if.c
index 6f567861d1..48c01af882 100644
--- a/lib/if.c
+++ b/lib/if.c
@@ -98,8 +98,8 @@ int if_cmp_name_func(const char *p1, const char *p2)
if (!*p2)
return 1;
- x1 = strtol(p1, (char **)&tmp1, 10);
- x2 = strtol(p2, (char **)&tmp2, 10);
+ x1 = strtol(p1, &tmp1, 10);
+ x2 = strtol(p2, &tmp2, 10);
/* let's compare numbers now */
if (x1 < x2)
diff --git a/lib/link_state.c b/lib/link_state.c
index 105e3e28a9..25373bdb20 100644
--- a/lib/link_state.c
+++ b/lib/link_state.c
@@ -1739,7 +1739,7 @@ struct ls_message *ls_subnet2msg(struct ls_message *msg,
struct ls_vertex *ls_msg2vertex(struct ls_ted *ted, struct ls_message *msg,
bool delete)
{
- struct ls_node *node = (struct ls_node *)msg->data.node;
+ struct ls_node *node = msg->data.node;
struct ls_vertex *vertex = NULL;
switch (msg->event) {
@@ -1779,7 +1779,7 @@ struct ls_vertex *ls_msg2vertex(struct ls_ted *ted, struct ls_message *msg,
struct ls_edge *ls_msg2edge(struct ls_ted *ted, struct ls_message *msg,
bool delete)
{
- struct ls_attributes *attr = (struct ls_attributes *)msg->data.attr;
+ struct ls_attributes *attr = msg->data.attr;
struct ls_edge *edge = NULL;
switch (msg->event) {
@@ -1819,7 +1819,7 @@ struct ls_edge *ls_msg2edge(struct ls_ted *ted, struct ls_message *msg,
struct ls_subnet *ls_msg2subnet(struct ls_ted *ted, struct ls_message *msg,
bool delete)
{
- struct ls_prefix *pref = (struct ls_prefix *)msg->data.prefix;
+ struct ls_prefix *pref = msg->data.prefix;
struct ls_subnet *subnet = NULL;
switch (msg->event) {
diff --git a/ospf6d/ospf6_gr_helper.c b/ospf6d/ospf6_gr_helper.c
index 8159ac0cd3..be1042f260 100644
--- a/ospf6d/ospf6_gr_helper.c
+++ b/ospf6d/ospf6_gr_helper.c
@@ -134,7 +134,7 @@ static int ospf6_extract_grace_lsa_fields(struct ospf6_lsa *lsa,
uint16_t length = 0;
int sum = 0;
- lsah = (struct ospf6_lsa_header *)lsa->header;
+ lsah = lsa->header;
if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) {
if (IS_DEBUG_OSPF6_GR)
zlog_debug("%s: undersized (%u B) lsa", __func__,
@@ -1231,7 +1231,7 @@ static int ospf6_grace_lsa_show_info(struct vty *vty, struct ospf6_lsa *lsa,
uint16_t length = 0;
int sum = 0;
- lsah = (struct ospf6_lsa_header *)lsa->header;
+ lsah = lsa->header;
if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) {
if (IS_DEBUG_OSPF6_GR)
zlog_debug("%s: undersized (%u B) lsa", __func__,
diff --git a/sharpd/sharp_vty.c b/sharpd/sharp_vty.c
index e891c1b6be..cf79bacc6b 100644
--- a/sharpd/sharp_vty.c
+++ b/sharpd/sharp_vty.c
@@ -948,7 +948,7 @@ DEFPY (import_te,
static void sharp_srv6_locator_chunk_free(struct prefix_ipv6 *chunk)
{
- prefix_ipv6_free((struct prefix_ipv6 **)&chunk);
+ prefix_ipv6_free(&chunk);
}
DEFPY (sharp_srv6_manager_get_locator_chunk,
diff --git a/zebra/tc_netlink.c b/zebra/tc_netlink.c
index d0f4ed6d18..d633c07770 100644
--- a/zebra/tc_netlink.c
+++ b/zebra/tc_netlink.c
@@ -160,7 +160,7 @@ static ssize_t netlink_qdisc_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n;
struct tcmsg t;
char buf[0];
- } *req = (void *)data;
+ } *req = data;
if (datalen < sizeof(*req))
return 0;
@@ -236,7 +236,7 @@ static ssize_t netlink_tclass_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n;
struct tcmsg t;
char buf[0];
- } *req = (void *)data;
+ } *req = data;
if (datalen < sizeof(*req))
return 0;
@@ -486,7 +486,7 @@ static ssize_t netlink_tfilter_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n;
struct tcmsg t;
char buf[0];
- } *req = (void *)data;
+ } *req = data;
if (datalen < sizeof(*req))
return 0;