Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

A couple minor fixes #14510

Merged
merged 2 commits into from
Sep 29, 2023
Merged

A couple minor fixes #14510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c323b93
zebra: Drop new lines from zlog_debug for dpdk debug messages
ton31337 Sep 29, 2023
02d8b80
*: Do not cast to the same type as the destination is
ton31337 Sep 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions bgpd/bgp_evpn_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
5 changes: 2 additions & 3 deletions bgpd/bgp_linkstate_tlv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/darr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
4 changes: 2 additions & 2 deletions lib/if.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions lib/link_state.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions ospf6d/ospf6_gr_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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__,
Expand Down Expand Up @@ -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__,
Expand Down
2 changes: 1 addition & 1 deletion sharpd/sharp_vty.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions zebra/dpdk/zebra_dplane_dpdk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,11 +611,11 @@ static void zd_dpdk_port_init(void)
if (rte_flow_isolate(port_id, 1, &error)) {
if (IS_ZEBRA_DEBUG_DPLANE_DPDK)
zlog_debug(
"Flow isolate on port %u failed %d\n",
"Flow isolate on port %u failed %d",
port_id, error.type);
} else {
if (IS_ZEBRA_DEBUG_DPLANE_DPDK)
zlog_debug("Flow isolate on port %u\n",
zlog_debug("Flow isolate on port %u",
port_id);
}
rc = rte_eth_dev_start(port_id);
Expand Down
6 changes: 3 additions & 3 deletions zebra/tc_netlink.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
Loading