Lint-fixes on Com-module part I

diff --git a/communication/Com/Com.c b/communication/Com/Com.c
index 17fd1e4cc6005bb4ca2e525c9e6f6a4a37c66ae2..8b9783caebe858957d1cf5d13f8c1dc6a2f47349 100644 (file)
--- a/communication/Com/Com.c
+++ b/communication/Com/Com.c
@@ -196,11 +196,11 @@ void Com_Init(const Com_ConfigType *config ) {
                }\r
 \r
                // Configure per I-PDU based deadline monitoring.\r
-               for (int j = 0; IPdu->ComIPduSignalRef != NULL && IPdu->ComIPduSignalRef[j] != NULL; j++) {\r
+               for (int j = 0; (IPdu->ComIPduSignalRef != NULL) && (IPdu->ComIPduSignalRef[j] != NULL); j++) {\r
                        Signal = IPdu->ComIPduSignalRef[j];\r
                        GET_ArcSignal(Signal->ComHandleId);\r
 \r
-                       if (Signal->ComTimeoutFactor > 0 && !Signal->ComSignalArcUseUpdateBit) {\r
+                       if ( (Signal->ComTimeoutFactor > 0) && (!Signal->ComSignalArcUseUpdateBit) ) {\r
                                Arc_Signal->ComTimeoutFactor = earliestDeadline;\r
                                Arc_Signal->Com_Arc_DeadlineCounter = firstTimeout;\r
                        }\r

diff --git a/communication/Com/Com_Internal.h b/communication/Com/Com_Internal.h
index 570be8a7949bfd4dd55f04ef98e740b96779f1a2..5ad2ab3c45c13dae426ef3469a3e7b2a8e5507a5 100644 (file)
--- a/communication/Com/Com_Internal.h
+++ b/communication/Com/Com_Internal.h
@@ -56,9 +56,9 @@ extern const Com_ConfigType * ComConfig;
 #endif\r
 \r
 \r
-#define TESTBIT(source,bit) (*((uint8 *)source + (bit / 8)) & (1 << (bit % 8)))\r
-#define SETBIT(dest,bit) *((uint8 *)dest + (bit / 8)) |= (1 << (bit % 8))\r
-#define CLEARBIT(dest,bit) *((uint8 *)dest + (bit / 8)) &= ~(1 << (bit % 8))\r
+#define TESTBIT(source,bit) ( (*((uint8 *)source + (bit / 8)) & (1 << (bit % 8))) )\r
+#define SETBIT(dest,bit) ( *((uint8 *)dest + (bit / 8)) |= (1 << (bit % 8)) )\r
+#define CLEARBIT(dest,bit) ( *((uint8 *)dest + (bit / 8)) &= ~(1 << (bit % 8)) )\r
 \r
 #define GET_Signal(SignalId) \\r
        const ComSignal_type * Signal = &ComConfig->ComSignal[SignalId]\\r

diff --git a/communication/Com/Com_RunTest.c b/communication/Com/Com_RunTest.c
index 6693c5e82e90cda16ecf66dc34482705b1ad1610..64a8c84cd0ddcaad1b4edbf88204f2210c6dfda7 100644 (file)
--- a/communication/Com/Com_RunTest.c
+++ b/communication/Com/Com_RunTest.c
@@ -68,7 +68,7 @@ void RTE_EngineMain() {
        if (setNewSpeed) {\r
                Com_ReceiveSignal(1, (void *)&newSpeed);\r
 \r
-       LDEBUG_PRINTF("Setting engine speed to %d rpm\n", newSpeed);\r
+               LDEBUG_PRINTF("Setting engine speed to %d rpm\n", newSpeed);\r
                /*\r
                static uint16 sig;\r
                sig = rand() % 10000;\r

diff --git a/communication/Com/Com_misc.c b/communication/Com/Com_misc.c
index e6521b602ab0710b5fbdf8f0da6d7524ac6a2c9d..03615a7fbc9cd40247bdb31cca322c56cbc3eff5 100644 (file)
--- a/communication/Com/Com_misc.c
+++ b/communication/Com/Com_misc.c
@@ -104,8 +104,7 @@ void Com_ReadSignalDataFromPduBuffer(
                // Swap source bytes before reading\r
                // TODO: Must adapt to larger PDUs!\r
                uint8 pduBufferBytes_swap[8];\r
-               int i = 0;\r
-               for (i = 0; i < 8; ++i) {\r
+               for (int i = 0; i < 8; ++i) {\r
                        pduBufferBytes_swap[i] = pduBufferBytes[7 - i];\r
                }\r
                startBitOffset = intelBitNrToPduOffset(bitPosition, bitSize, 64);\r
@@ -348,7 +347,7 @@ void Com_ReadDataSegment(uint8 *dest, const uint8 *source, uint8 destByteLength,
                                if (sourceByteNr == sourceByteLength) {                 // if we are on the last source byte..\r
                                        shiftReg |= sourceStartByteMask;                // ..we need to mask out stuff we don't want\r
                                }\r
-                               shiftReg = ~(shiftReg);                                         // shifting inverted to shift in 1:s\r
+                               shiftReg = (uint16)~(shiftReg);                                         // shifting inverted to shift in 1:s\r
                                shiftReg <<= 8;                                                         // shift up (to match destination "byte space")\r
                                shiftReg = ~(shiftReg);\r
                                shiftReg >>= sourceAlignmentShift;                              // shift down to align\r