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

Remove duplicate prototype definition #851

Closed
skliper opened this issue Mar 10, 2021 · 0 comments · Fixed by #895 or #917
Closed

Remove duplicate prototype definition #851

skliper opened this issue Mar 10, 2021 · 0 comments · Fixed by #895 or #917
Assignees
@skliper
Labels
CFS-38 enhancement
Milestone
Caelum

Comments

@skliper
Copy link
Contributor

skliper commented Mar 10, 2021 •
edited
Loading

Is your feature request related to a problem? Please describe.
Duplicated prototypes for OS_NetworkGetId and OS_NetworkGetHostName:

osal/src/os/inc/osapi-sockets.h

Line 385 in ead5723

int32 OS_NetworkGetID(void);

osal/src/os/inc/osapi-sockets.h

Line 399 in ead5723

int32 OS_NetworkGetHostName(char *host_name, size_t name_len);

osal/src/os/inc/osapi-network.h

Line 53 in ead5723

int32 OS_NetworkGetID(void);

osal/src/os/inc/osapi-network.h

Line 67 in ead5723

int32 OS_NetworkGetHostName(char *host_name, size_t name_len);

Describe the solution you'd like
Remove from osapi-sockets.h

Describe alternatives you've considered
Deprecate/remove (see issue #852)

Additional context
None

Requester Info
Jacob Hageman - NASA/GSFC, OSAL code review
@skliper skliper added this to the 6.0.0 milestone Mar 10, 2021
@skliper skliper self-assigned this Mar 11, 2021
skliper added a commit to skliper/osal that referenced this issue Mar 11, 2021
@skliper
Fix nasa#851, Remove duplicate network prototypes
d1d9e39
@skliper skliper mentioned this issue Mar 11, 2021
Merged
@astrogeco astrogeco mentioned this issue Mar 17, 2021
Merged
astrogeco added a commit that referenced this issue Mar 17, 2021
@astrogeco
Merge pull request #895 from skliper/fix851-duplicate_prototype
3546b4e 
Fix #851, Remove duplicate network prototypes
jphickey pushed a commit to jphickey/osal that referenced this issue Aug 10, 2022
@skliper
Fix nasa#851, Pass aligned message into CFE_MSG_ComputeCheckSum
2799d07
jphickey pushed a commit to jphickey/osal that referenced this issue Aug 10, 2022
@yammajamma
Merge pull request nasa#852 from skliper/fix851-cast-align-checksum
64f0da9 
Fix nasa#851, Pass aligned message into CFE_MSG_ComputeCheckSum
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@skliper skliper

Labels
CFS-38 enhancement
Projects
None yet
Milestone
Caelum
1 participant
@skliper