matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

*: Do not cast to the same type as the destination is

Browse source 
Signed-off-by: Donatas Abraitis <donatas@opensourcerouting.org>
This commit is contained in:
Donatas Abraitis 2023-09-29 09:17:56 +03:00
parent c323b930ea
commit 02d8b80ce4
8 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bgpd/bgp_evpn_vty.c
View file

@ -2687,15 +2687,15 @@ static void evpn_show_route_vni_macip(struct vty *vty, struct bgp *bgp,
*/ */
if (is_evpn_prefix_ipaddr_none(evp)) { if (is_evpn_prefix_ipaddr_none(evp)) {
/* VNI MAC -> Global */ /* VNI MAC -> Global */
evpn_type2_prefix_global_copy( evpn_type2_prefix_global_copy(&tmp_p, evp,
(struct prefix_evpn *)&tmp_p, evp,
NULL /* mac */, NULL /* mac */,
evpn_type2_path_info_get_ip(pi)); evpn_type2_path_info_get_ip(
pi));
} else { } else {
/* VNI IP -> Global */ /* VNI IP -> Global */
evpn_type2_prefix_global_copy( evpn_type2_prefix_global_copy(&tmp_p, evp,
(struct prefix_evpn *)&tmp_p, evp, evpn_type2_path_info_get_mac(
evpn_type2_path_info_get_mac(pi), pi),
NULL /* ip */); NULL /* ip */);
} }

5
bgpd/bgp_linkstate_tlv.c
View file

@ -1066,10 +1066,9 @@ static void bgp_linkstate_tlv_sid_display(struct vty *vty, uint8_t *pnt,
/* IS-IS System-ID */ /* IS-IS System-ID */
if (json) if (json)
json_object_string_addf(json_data, "neighborId", json_object_string_addf(json_data, "neighborId",
"%pSY\n", "%pSY\n", pnt);
(uint8_t *)pnt);
else else
vty_out(vty, "%pSY\n", (uint8_t *)pnt); vty_out(vty, "%pSY\n", pnt);
pnt += 6; pnt += 6;
} }
} }

2
lib/darr.c
View file

@ -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); memset(_a_at(at), 0, esize * count);
} }
return (void *)a; return a;
#undef _a_at #undef _a_at
} }

4
lib/if.c
View file

@ -98,8 +98,8 @@ int if_cmp_name_func(const char *p1, const char *p2)
if (!*p2) if (!*p2)
return 1; return 1;
x1 = strtol(p1, (char **)&tmp1, 10); x1 = strtol(p1, &tmp1, 10);
x2 = strtol(p2, (char **)&tmp2, 10); x2 = strtol(p2, &tmp2, 10);
/* let's compare numbers now */ /* let's compare numbers now */
if (x1 < x2) if (x1 < x2)

6
lib/link_state.c
View file

@ -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, struct ls_vertex *ls_msg2vertex(struct ls_ted *ted, struct ls_message *msg,
bool delete) bool delete)
{ {
struct ls_node *node = (struct ls_node *)msg->data.node; struct ls_node *node = msg->data.node;
struct ls_vertex *vertex = NULL; struct ls_vertex *vertex = NULL;
switch (msg->event) { 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, struct ls_edge *ls_msg2edge(struct ls_ted *ted, struct ls_message *msg,
bool delete) bool delete)
{ {
struct ls_attributes *attr = (struct ls_attributes *)msg->data.attr; struct ls_attributes *attr = msg->data.attr;
struct ls_edge *edge = NULL; struct ls_edge *edge = NULL;
switch (msg->event) { 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, struct ls_subnet *ls_msg2subnet(struct ls_ted *ted, struct ls_message *msg,
bool delete) bool delete)
{ {
struct ls_prefix *pref = (struct ls_prefix *)msg->data.prefix; struct ls_prefix *pref = msg->data.prefix;
struct ls_subnet *subnet = NULL; struct ls_subnet *subnet = NULL;
switch (msg->event) { switch (msg->event) {

4
ospf6d/ospf6_gr_helper.c
View file

@ -134,7 +134,7 @@ static int ospf6_extract_grace_lsa_fields(struct ospf6_lsa *lsa,
uint16_t length = 0; uint16_t length = 0;
int sum = 0; int sum = 0;
lsah = (struct ospf6_lsa_header *)lsa->header; lsah = lsa->header;
if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) { if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) {
if (IS_DEBUG_OSPF6_GR) if (IS_DEBUG_OSPF6_GR)
zlog_debug("%s: undersized (%u B) lsa", __func__, 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; uint16_t length = 0;
int sum = 0; int sum = 0;
lsah = (struct ospf6_lsa_header *)lsa->header; lsah = lsa->header;
if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) { if (ntohs(lsah->length) <= OSPF6_LSA_HEADER_SIZE) {
if (IS_DEBUG_OSPF6_GR) if (IS_DEBUG_OSPF6_GR)
zlog_debug("%s: undersized (%u B) lsa", __func__, zlog_debug("%s: undersized (%u B) lsa", __func__,

2
sharpd/sharp_vty.c
View file

@ -948,7 +948,7 @@ DEFPY (import_te,
static void sharp_srv6_locator_chunk_free(struct prefix_ipv6 *chunk) 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, DEFPY (sharp_srv6_manager_get_locator_chunk,

6
zebra/tc_netlink.c
View file

@ -160,7 +160,7 @@ static ssize_t netlink_qdisc_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n; struct nlmsghdr n;
struct tcmsg t; struct tcmsg t;
char buf[0]; char buf[0];
} *req = (void *)data; } *req = data;
if (datalen < sizeof(*req)) if (datalen < sizeof(*req))
return 0; return 0;
@ -236,7 +236,7 @@ static ssize_t netlink_tclass_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n; struct nlmsghdr n;
struct tcmsg t; struct tcmsg t;
char buf[0]; char buf[0];
} *req = (void *)data; } *req = data;
if (datalen < sizeof(*req)) if (datalen < sizeof(*req))
return 0; return 0;
@ -486,7 +486,7 @@ static ssize_t netlink_tfilter_msg_encode(int cmd, struct zebra_dplane_ctx *ctx,
struct nlmsghdr n; struct nlmsghdr n;
struct tcmsg t; struct tcmsg t;
char buf[0]; char buf[0];
} *req = (void *)data; } *req = data;
if (datalen < sizeof(*req)) if (datalen < sizeof(*req))
return 0; return 0;