Skip to content

Commit 9c38912

Browse files
committed
Merge pull request #74 from skliper/fix58-header_guard
Fix #58, Apply header guard standard
2 parents 25e3c42 + f88ad77 commit 9c38912

File tree

5 files changed

+14
-22
lines changed

5 files changed

+14
-22
lines changed

fsw/public_inc/sample_lib.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
** Specification for the sample library functions.
2525
**
2626
*************************************************************************/
27-
#ifndef _sample_lib_h_
28-
#define _sample_lib_h_
27+
#ifndef SAMPLE_LIB_H
28+
#define SAMPLE_LIB_H
2929

3030
/************************************************************************
3131
** Includes
@@ -73,8 +73,4 @@ int32 SAMPLE_LIB_Init(void);
7373
*************************************************************************/
7474
int32 SAMPLE_LIB_Function(void);
7575

76-
#endif /* _sample_lib_h_ */
77-
78-
/************************/
79-
/* End of File Comment */
80-
/************************/
76+
#endif

fsw/src/sample_lib_internal.h

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
** Notes:
2727
**
2828
*************************************************************************/
29-
#ifndef _sample_lib_internal_h_
30-
#define _sample_lib_internal_h_
29+
#ifndef SAMPLE_LIB_INTERNAL_H
30+
#define SAMPLE_LIB_INTERNAL_H
3131

3232
/* Include all external/public definitions */
3333
#include "sample_lib.h"
@@ -52,8 +52,4 @@ extern char SAMPLE_LIB_Buffer[SAMPLE_LIB_BUFFER_SIZE];
5252
*/
5353
int32 SAMPLE_LIB_Init(void);
5454

55-
#endif /* _sample_lib_internal_h_ */
56-
57-
/************************/
58-
/* End of File Comment */
59-
/************************/
55+
#endif

unit-test/coveragetest/sample_lib_coveragetest_common.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
** Common definitions for all sample_lib coverage tests
2626
*/
2727

28-
#ifndef _SAMPLE_LIB_COVERAGETEST_COMMON_H_
29-
#define _SAMPLE_LIB_COVERAGETEST_COMMON_H_
28+
#ifndef SAMPLE_LIB_COVERAGETEST_COMMON_H
29+
#define SAMPLE_LIB_COVERAGETEST_COMMON_H
3030

3131
/*
3232
* Includes

unit-test/inc/OCS_string.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
** strncpy().
3131
*/
3232

33-
#ifndef _STUB_STRING_H_
34-
#define _STUB_STRING_H_
33+
#ifndef OSC_STRING_H
34+
#define OSC_STRING_H
3535

3636
/* ----------------------------------------- */
3737
/* prototypes normally declared in string.h */
3838
/* ----------------------------------------- */
3939

4040
extern char *OCS_strncpy(char *dest, const char *src, unsigned long size);
4141

42-
#endif /* _STUB_STRING_H_ */
42+
#endif

unit-test/override_inc/string.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
** strncpy().
3131
*/
3232

33-
#ifndef _OVERRIDE_STRING_H_
34-
#define _OVERRIDE_STRING_H_
33+
#ifndef OVERRIDE_STRING_H
34+
#define OVERRIDE_STRING_H
3535

3636
#include "OCS_string.h"
3737

@@ -41,4 +41,4 @@
4141

4242
#define strncpy OCS_strncpy
4343

44-
#endif /* _OVERRIDE_STRING_H_ */
44+
#endif

0 commit comments

Comments
 (0)