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

Integration Candidate: 2020-11-03 #991

Merged
merged 14 commits into from
Nov 4, 2020
Merged

Integration Candidate: 2020-11-03 #991

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e6296e6
Fix #909, reorganize ES public API + msg definitions
jphickey Oct 26, 2020
d684a6c
Fix #967, Update startup script names
jphickey Oct 27, 2020
d21d94a
Fix #966, update padding in CDS registry record
jphickey Oct 27, 2020
f9f18a7
Fix #370, rename MAX CDS name macro to FULL_NAME_LEN
jphickey Oct 27, 2020
8020224
Fix #976, short background task name
jphickey Oct 28, 2020
5365480
Fix #970, strncpy warning
jphickey Oct 27, 2020
2e8b9b6
Merge pull request #977 from jphickey/fix-976-bgtask-name
astrogeco Oct 30, 2020
398471a
Merge pull request #964 from jphickey/fix-909-extern-defs
astrogeco Oct 30, 2020
7047db6
Fix #988, add casts on printf calls
jphickey Nov 2, 2020
8935e89
HOTFIX #991, correct doxygen reference
jphickey Nov 2, 2020
6a854e6
Merge pull request #968 from jphickey/fix-967-startup-names
astrogeco Nov 2, 2020
180559b
Merge pull request #971 from jphickey/fix-970-strncpy-warning
astrogeco Nov 2, 2020
df2de6c
Merge pull request #990 from jphickey/fix-988-printf-warnings
astrogeco Nov 3, 2020
0ba6091
Bump to v6.8.0-rc1+dev164 and update ReadMe
astrogeco Nov 4, 2020
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
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/sb/cfe_sb_api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,7 +896,7 @@ int32 CFE_SB_SubscribeFull(CFE_SB_MsgId_t MsgId,
{
CFE_EVS_SendEventWithAppID(CFE_SB_HASHCOLLISION_EID, CFE_EVS_EventType_DEBUG, CFE_SB.AppId,
"Msg hash collision: MsgId = 0x%x, collisions = %u",
(unsigned int)CFE_SB_MsgIdToValue(MsgId), Collisions);
(unsigned int)CFE_SB_MsgIdToValue(MsgId), (unsigned int)Collisions);
}

return CFE_SUCCESS;
Expand Down
2 changes: 1 addition & 1 deletion modules/sbr/unit-test-coverage/test_cfe_sbr_map_direct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ void Test_SBR_Map_Direct(void)
count++;
}
}
UtPrintf("Valid route id's encountered in performance loop: %u", count);
UtPrintf("Valid route id's encountered in performance loop: %u", (unsigned int)count);
}

/* Main unit test routine */
Expand Down
2 changes: 1 addition & 1 deletion modules/sbr/unit-test-coverage/test_cfe_sbr_map_hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ void Test_SBR_Map_Hash(void)
count++;
}
}
UtPrintf("Valid route id's encountered in performance loop: %u", count);
UtPrintf("Valid route id's encountered in performance loop: %u", (unsigned int)count);
}

/* Main unit test routine */
Expand Down