Skip to content

Commit 2ebd44e

Browse files
authoredJul 3, 2020
[sonic-swss] ARMHF warning fixes (sonic-net#1325)
Compiler Warnings : cast increases required alignment of target type [-Wcast-align] Fix: Use reintrepret cast to cast lower size pointer to bigger size pointer types Signed-off-by: Antony Rheneus <arheneus@marvell.com>
1 parent 10ad70c commit 2ebd44e

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed
 

‎mclagsyncd/mclaglink.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,14 @@ void MclagLink::setPortIsolate(char *msg)
197197
cur = msg;
198198

199199
/*get isolate src port infor*/
200-
op_hdr = (mclag_sub_option_hdr_t *)cur;
200+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
201201
cur = cur + MCLAG_SUB_OPTION_HDR_LEN;
202202
isolate_src_port.insert(0, (const char*)cur, op_hdr->op_len);
203203

204204
cur = cur + op_hdr->op_len;
205205

206206
/*get isolate dst ports infor*/
207-
op_hdr = (mclag_sub_option_hdr_t *)cur;
207+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
208208
cur = cur + MCLAG_SUB_OPTION_HDR_LEN;
209209
isolate_dst_port.insert(0, (const char*)cur, op_hdr->op_len);
210210

@@ -265,7 +265,7 @@ void MclagLink::setPortMacLearnMode(char *msg)
265265
cur = msg;
266266

267267
/*get port learning mode info*/
268-
op_hdr = (mclag_sub_option_hdr_t *)cur;
268+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
269269
if (op_hdr->op_type == MCLAG_SUB_OPTION_TYPE_MAC_LEARN_ENABLE)
270270
{
271271
learn_mode = "hardware";
@@ -319,7 +319,7 @@ void MclagLink::setFdbFlushByPort(char *msg)
319319

320320
cur = msg;
321321
/*get port infor*/
322-
op_hdr = (mclag_sub_option_hdr_t *)cur;
322+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
323323
cur = cur + MCLAG_SUB_OPTION_HDR_LEN;
324324
port.insert(0, (const char*)cur, op_hdr->op_len);
325325

@@ -340,14 +340,14 @@ void MclagLink::setIntfMac(char *msg)
340340
cur = msg;
341341

342342
/*get intf key name*/
343-
op_hdr = (mclag_sub_option_hdr_t *)cur;
343+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
344344
cur = cur + MCLAG_SUB_OPTION_HDR_LEN;
345345
intf_key.insert(0, (const char*)cur, op_hdr->op_len);
346346

347347
cur = cur + op_hdr->op_len;
348348

349349
/*get mac*/
350-
op_hdr = (mclag_sub_option_hdr_t *)cur;
350+
op_hdr = reinterpret_cast<mclag_sub_option_hdr_t *>(static_cast<void *>(cur));
351351
cur = cur + MCLAG_SUB_OPTION_HDR_LEN;
352352
mac_value.insert(0, (const char*)cur, op_hdr->op_len);
353353

@@ -379,7 +379,7 @@ void MclagLink::setFdbEntry(char *msg, int msg_len)
379379
{
380380
memset(key, 0, 64);
381381

382-
fdb_info = (struct mclag_fdb_info *)(cur + index * sizeof(struct mclag_fdb_info));
382+
fdb_info = reinterpret_cast<struct mclag_fdb_info *>(static_cast<void *>(cur + index * sizeof(struct mclag_fdb_info)));
383383

384384
fdb.mac = fdb_info->mac;
385385
fdb.port_name = fdb_info->port_name;
@@ -502,7 +502,7 @@ ssize_t MclagLink::getFdbChange(char *msg_buf)
502502
{
503503
if (MCLAG_MAX_SEND_MSG_LEN - infor_len < sizeof(struct mclag_fdb_info))
504504
{
505-
msg_head = (mclag_msg_hdr_t *)infor_start;
505+
msg_head = reinterpret_cast<mclag_msg_hdr_t *>(static_cast<void *>(infor_start));
506506
msg_head->version = 1;
507507
msg_head->msg_len = (unsigned short)infor_len;
508508
msg_head->msg_type = MCLAG_SYNCD_MSG_TYPE_FDB_OPERATION;
@@ -535,7 +535,7 @@ ssize_t MclagLink::getFdbChange(char *msg_buf)
535535
{
536536
if (MCLAG_MAX_SEND_MSG_LEN - infor_len < sizeof(struct mclag_fdb_info))
537537
{
538-
msg_head = (mclag_msg_hdr_t *)infor_start;
538+
msg_head = reinterpret_cast<mclag_msg_hdr_t *>(static_cast<void *>(infor_start));
539539
msg_head->version = 1;
540540
msg_head->msg_len = (unsigned short)infor_len;
541541
msg_head->msg_type = MCLAG_SYNCD_MSG_TYPE_FDB_OPERATION;
@@ -567,7 +567,7 @@ ssize_t MclagLink::getFdbChange(char *msg_buf)
567567
if (infor_len <= sizeof(mclag_msg_hdr_t)) /*no fdb entry need notifying iccpd*/
568568
return 1;
569569

570-
msg_head = (mclag_msg_hdr_t *)infor_start;
570+
msg_head = reinterpret_cast<mclag_msg_hdr_t *>(static_cast<void *>(infor_start));
571571
msg_head->version = 1;
572572
msg_head->msg_len = (unsigned short)infor_len;
573573
msg_head->msg_type = MCLAG_SYNCD_MSG_TYPE_FDB_OPERATION;
@@ -676,7 +676,7 @@ uint64_t MclagLink::readData()
676676

677677
while (true)
678678
{
679-
hdr = (mclag_msg_hdr_t *)(m_messageBuffer + start);
679+
hdr = reinterpret_cast<mclag_msg_hdr_t *>(static_cast<void *>(m_messageBuffer + start));
680680
left = m_pos - start;
681681
if (left < MCLAG_MSG_HDR_LEN)
682682
break;

0 commit comments

Comments
 (0)
Please sign in to comment.