Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #58, Apply header guard standard #74

Merged
merged 1 commit into from
Feb 25, 2022
Merged

Fix #58, Apply header guard standard #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions fsw/public_inc/sample_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
** Specification for the sample library functions.
**
*************************************************************************/
#ifndef _sample_lib_h_
#define _sample_lib_h_
#ifndef SAMPLE_LIB_H
#define SAMPLE_LIB_H

/************************************************************************
** Includes
Expand Down Expand Up @@ -73,8 +73,4 @@ int32 SAMPLE_LIB_Init(void);
*************************************************************************/
int32 SAMPLE_LIB_Function(void);

#endif /* _sample_lib_h_ */

/************************/
/* End of File Comment */
/************************/
#endif
10 changes: 3 additions & 7 deletions fsw/src/sample_lib_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
** Notes:
**
*************************************************************************/
#ifndef _sample_lib_internal_h_
#define _sample_lib_internal_h_
#ifndef SAMPLE_LIB_INTERNAL_H
#define SAMPLE_LIB_INTERNAL_H

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

#endif /* _sample_lib_internal_h_ */

/************************/
/* End of File Comment */
/************************/
#endif
4 changes: 2 additions & 2 deletions unit-test/coveragetest/sample_lib_coveragetest_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
** Common definitions for all sample_lib coverage tests
*/

#ifndef _SAMPLE_LIB_COVERAGETEST_COMMON_H_
#define _SAMPLE_LIB_COVERAGETEST_COMMON_H_
#ifndef SAMPLE_LIB_COVERAGETEST_COMMON_H
#define SAMPLE_LIB_COVERAGETEST_COMMON_H

/*
* Includes
Expand Down
6 changes: 3 additions & 3 deletions unit-test/inc/OCS_string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
** strncpy().
*/

#ifndef _STUB_STRING_H_
#define _STUB_STRING_H_
#ifndef OSC_STRING_H
#define OSC_STRING_H

/* ----------------------------------------- */
/* prototypes normally declared in string.h */
/* ----------------------------------------- */

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

#endif /* _STUB_STRING_H_ */
#endif
6 changes: 3 additions & 3 deletions unit-test/override_inc/string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
** strncpy().
*/

#ifndef _OVERRIDE_STRING_H_
#define _OVERRIDE_STRING_H_
#ifndef OVERRIDE_STRING_H
#define OVERRIDE_STRING_H

#include "OCS_string.h"

Expand All @@ -41,4 +41,4 @@

#define strncpy OCS_strncpy

#endif /* _OVERRIDE_STRING_H_ */
#endif