fix cpplint C errors

Signed-off-by: Martin Melik Merkumians <[email protected]>

Author: MartinMelikMerkumians

.mega-linter.yml

@@ -17,12 +17,14 @@ DISABLE_LINTERS:
 C_CLANG_FORMAT_ARGUMENTS: "--style=file"
 
 # cpplint specific configuration
+# Use `source` as root so header-guard checks for headers under `source/tests`
+# don't require an extra `SOURCE_` prefix when file paths are evaluated.
 C_CPPLINT_ARGUMENTS:
-  - "--root=source/src"
+  - "--root=source"
   - "--filter=-whitespace/line_length,-readability/casting,-build/include_what_you_use"
   - "--recursive"
 CPP_CPPLINT_ARGUMENTS:
-  - "--root=source/src"
+  - "--root=source"
   - "--filter=-whitespace/line_length,-readability/casting,-build/include_what_you_use"
   - "--recursive"
 

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
       - id: cpplint
         types_or: [c, c++, header]
         args:
-          - "--root=source/src"
+          - "--root=source"
           - "--filter=-whitespace/line_length,-readability/casting,-build/include_what_you_use"
           - "--recursive"
 

AUTHORS

@@ -2,3 +2,5 @@ Kurt Schweiger
 Rene Smodic
 Alois Zoitl
 Jonathan Engdahl
+Martin Melik Merkumians
+Ingo Hegny

source/src/api/opener_api.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  *
  ******************************************************************************/
-#ifndef API_OPENER_API_H_
-#define API_OPENER_API_H_
+#ifndef SRC_API_OPENER_API_H_
+#define SRC_API_OPENER_API_H_
 
 #include <assert.h>
 #include <stdbool.h>
@@ -1178,4 +1178,4 @@ void RegisterTimeoutChecker(TimeoutCheckerFunction timeout_checker_function);
  *
  */
 
-#endif  // API_OPENER_API_H_
+#endif  // SRC_API_OPENER_API_H_

source/src/cip/appcontype.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  *
  ******************************************************************************/
-#ifndef CIP_APPCONTYPE_H_
-#define CIP_APPCONTYPE_H_
+#ifndef SRC_CIP_APPCONTYPE_H_
+#define SRC_CIP_APPCONTYPE_H_
 
 #include "cip/cipconnectionmanager.h"
 
@@ -73,4 +73,4 @@ void CloseAllConnections(void);
  */
 bool ConnectionWithSameConfigPointExists(const EipUint32 config_point);
 
-#endif  // CIP_APPCONTYPE_H_
+#endif  // SRC_CIP_APPCONTYPE_H_

source/src/cip/cipassembly.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  *
  ******************************************************************************/
-#ifndef CIP_CIPASSEMBLY_H_
-#define CIP_CIPASSEMBLY_H_
+#ifndef SRC_CIP_CIPASSEMBLY_H_
+#define SRC_CIP_CIPASSEMBLY_H_
 
 #include "cip/ciptypes.h"
 #include "core/typedefs.h"
@@ -58,4 +58,4 @@ EipStatus NotifyAssemblyConnectedDataReceived(CipInstance* const instance,
                                               const EipUint8* const data,
                                               const size_t data_length);
 
-#endif  // CIP_CIPASSEMBLY_H_
+#endif  // SRC_CIP_CIPASSEMBLY_H_

source/src/cip/cipclass3connection.h

@@ -4,8 +4,8 @@
  *
  ******************************************************************************/
 
-#ifndef CIP_CIPCLASS3CONNECTION_H_
-#define CIP_CIPCLASS3CONNECTION_H_
+#ifndef SRC_CIP_CIPCLASS3CONNECTION_H_
+#define SRC_CIP_CIPCLASS3CONNECTION_H_
 
 /** @file cipclass3connection.h
  *  @brief CIP Class 3 connection
@@ -62,4 +62,4 @@ CipError EstablishClass3Connection(
  */
 void InitializeClass3ConnectionData(void);
 
-#endif /* CIP_CIPCLASS3CONNECTION_H_ */
+#endif /* SRC_CIP_CIPCLASS3CONNECTION_H_ */

source/src/cip/cipcommon.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  *
  ******************************************************************************/
-#ifndef CIP_CIPCOMMON_H_
-#define CIP_CIPCOMMON_H_
+#ifndef SRC_CIP_CIPCOMMON_H_
+#define SRC_CIP_CIPCOMMON_H_
 
 /** @file cipcommon.h
  * Common CIP object interface

source/src/cip/cipconnectionmanager.h

@@ -3,8 +3,8 @@
  * All rights reserved.
  *
  ******************************************************************************/
-#ifndef CIP_CIPCONNECTIONMANAGER_H_
-#define CIP_CIPCONNECTIONMANAGER_H_
+#ifndef SRC_CIP_CIPCONNECTIONMANAGER_H_
+#define SRC_CIP_CIPCONNECTIONMANAGER_H_
 
 #include "api/opener_api.h"
 #include "cip/cipconnectionobject.h"
@@ -321,4 +321,4 @@ void CheckForTimedOutConnectionsAndCloseTCPConnections(
   const CipConnectionObject* const connection_object,
   CloseSessionFunction CloseSessions);
 
-#endif  // CIP_CIPCONNECTIONMANAGER_H_
+#endif  // SRC_CIP_CIPCONNECTIONMANAGER_H_

source/src/cip/cipconnectionobject.h

@@ -4,8 +4,8 @@
  *
  ******************************************************************************/
 
-#ifndef CIP_CIPCONNECTIONOBJECT_H_
-#define CIP_CIPCONNECTIONOBJECT_H_
+#ifndef SRC_CIP_CIPCONNECTIONOBJECT_H_
+#define SRC_CIP_CIPCONNECTIONOBJECT_H_
 
 #include "api/opener_api.h"
 #include "cip/cipelectronickey.h"
@@ -508,4 +508,4 @@ bool CipConnectionObjectOriginatorHasSameIP(
   const CipConnectionObject* const connection_object,
   const struct sockaddr* const originator_address);
 
-#endif  // CIP_CIPCONNECTIONOBJECT_H_
+#endif  // SRC_CIP_CIPCONNECTIONOBJECT_H_