Skip to content

Commit e604e98

Browse files
committed
avoid 'may be used unitialized' warnings
gcc : -Wmaybe-uninitialized or -Wuninitialized
1 parent 703a6e0 commit e604e98

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

oshw/linux/oshw.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ ec_adaptert * oshw_find_adapters(void)
4444
int i;
4545
struct if_nameindex *ids;
4646
ec_adaptert * adapter;
47-
ec_adaptert * prev_adapter;
47+
ec_adaptert * prev_adapter = NULL;
4848
ec_adaptert * ret_adapter = NULL;
4949

5050

@@ -60,7 +60,7 @@ ec_adaptert * oshw_find_adapters(void)
6060
* adapter.
6161
* Else save as pointer to return.
6262
*/
63-
if (i)
63+
if (prev_adapter)
6464
{
6565
prev_adapter->next = adapter;
6666
}

soem/ethercateoe.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,8 @@ int ecx_EOErecv(ecx_contextt *context, uint16 slave, uint8 port, int * psize, vo
420420
NotLast = TRUE;
421421
buffersize = *psize;
422422
rxfragmentno = 0;
423+
rxframeno = 0xff;
424+
rxframeoffset = 0;
423425

424426
/* Hang for a while if nothing is in */
425427
wkc = ecx_mbxreceive(context, slave, (ec_mbxbuft *)&MbxIn, timeout);
@@ -446,7 +448,6 @@ int ecx_EOErecv(ecx_contextt *context, uint16 slave, uint8 port, int * psize, vo
446448

447449
if (rxfragmentno == 0)
448450
{
449-
rxframeoffset = 0;
450451
rxframeno = EOE_HDR_FRAME_NO_GET(frameinfo2);
451452
rxframesize = (EOE_HDR_FRAME_OFFSET_GET(frameinfo2) << 5);
452453
if (rxframesize > buffersize)

0 commit comments

Comments
 (0)