osal Integration candidate: Equuleus-rc1+dev5 #1451
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Use the "virtual_path" instead of "device_name" as the name record for FS_BASED entries. This should allow duplicate detection to work as expected. The device_name on mappings made via this method will now be an empty string. It is not relevant because this type of map is used for devices that are already mounted.
Fix #1433, use virtual path as name for FS_BASED maps
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
dzbaker
force-pushed
the
integration-candidate
branch
from
05bf65d
to
2484176
Compare
| @@ -296,28 +296,28 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_prop) | |||
| int32 OS_ModuleInfo(osal_id_t module_id, OS_module_prop_t *module_info) | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -420,7 +420,7 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_SymbolTableDump(const char *filename, size_t SizeLimit) | |||
| int32 OS_SymbolTableDump(const char *filename, size_t size_limit) | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -331,29 +331,29 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_SymbolLookup(cpuaddr *SymbolAddress, const char *SymbolName) | |||
| int32 OS_SymbolLookup(cpuaddr *symbol_address, const char *SymbolName) | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -1358,7 +1358,7 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| void OS_ForEachObjectOfType(osal_objtype_t idtype, osal_id_t creator_id, OS_ArgCallback_t callback_ptr, | |||
| void OS_ForEachObjectOfType(osal_objtype_t objtype, osal_id_t creator_id, OS_ArgCallback_t callback_ptr, | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -126,7 +126,7 @@ | |||
| * See prototype for argument/return detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *FileStats) | |||
| int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat) | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -90,7 +90,7 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_TimeBaseCreate(osal_id_t *timer_id, const char *timebase_name, OS_TimerSync_t external_sync) | |||
| int32 OS_TimeBaseCreate(osal_id_t *timebase_id, const char *timebase_name, OS_TimerSync_t external_sync) | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -197,10 +197,10 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_TimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_t timebase_ref_id, OS_ArgCallback_t callback_ptr, | |||
| int32 OS_TimerAdd(osal_id_t *timer_id, const char *timer_name, osal_id_t timebase_id, OS_ArgCallback_t callback_ptr, | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -226,7 +226,8 @@ | |||
| * See description in API and header file for detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_TimerCreate(osal_id_t *timer_id, const char *timer_name, uint32 *accuracy, OS_TimerCallback_t callback_ptr) | |||
| int32 OS_TimerCreate(osal_id_t *timer_id, const char *timer_name, uint32 *clock_accuracy, | |||
Check notice
Code scanning / CodeQL
Long function without assertion Note
| @@ -1368,7 +1368,7 @@ | |||
| filter.user_callback = callback_ptr; | |||
| filter.user_arg = callback_arg; | |||
|
|
|||
| if (OS_ObjectIdIteratorInit(OS_ForEachFilterCreator, &filter, idtype, &iter) == OS_SUCCESS) | |||
| if (OS_ObjectIdIteratorInit(OS_ForEachFilterCreator, &filter, objtype, &iter) == OS_SUCCESS) | |||
Check warning
Code scanning / CodeQL
Side effect in a Boolean expression Warning
| @@ -126,7 +126,7 @@ | |||
| * See prototype for argument/return detail | |||
| * | |||
| *-----------------------------------------------------------------*/ | |||
| int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *FileStats) | |||
| int32 OS_FileStat_Impl(const char *local_path, os_fstat_t *filestat) | |||
Check notice
Code scanning / CodeQL
Function too long Note
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Checklist (Please check before submitting)
Describe the contribution
Testing performed
cFS Bundle Checks
osal Checks
Expected behavior changes
See PRs
System(s) tested on
Ubuntu 20.04
Additional context
Add any other context about the contribution here.
Third party code
If included, identify any third party code and provide text file of license
Contributor Info - All information REQUIRED for consideration of pull request
@jphickey
@thesamprice
@thnkslprpt