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.

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

Fix #73, compression selectable at source file level #81

Merged
merged 1 commit into from
Feb 9, 2023

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Feb 9, 2023

Checklist (Please check before submitting)

Describe the contribution
Adds a cmake option for compression sub-component implementation. This replaces the FM_INCLUDE_DECOMPRESS option in fm_platform_cfg.h.

Currently available options are:

  • fslib (should be equivalent to FM_INCLUDE_DECOMPRESS set)
  • none (should be equivalent to FM_INCLUDE_DECOMPRESS unset)
  • zlib (stub for future work)

This lays the groundwork to support compression in addition to decompression, using an external 3rd part library if desired.

Fixes #73

Testing performed
Build and run all tests

Expected behavior changes
Compression option no longer in header file - now in a CMake option with source selection. Basically equivalent though.

System(s) tested on
Debian

Additional context
All conditional compilation (#ifdef) around compression has been removed. This comprised a fair bit of code in FM that was not being tested in any workflow because compression is usually disabled.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

@@ -236,6 +236,8 @@
}
}

FM_CompressionService_Init();

Check warning

Code scanning / CodeQL-security

Expression has no effect

This expression has no effect (because [FM_CompressionService_Init](1) has no external side effects).
Adds a cmake option for compression sub-component implementation.  This
replaces the FM_INCLUDE_DECOMPRESS option in fm_platform_cfg.h.

Currently available options are:
 - fslib (should be equivalent to FM_INCLUDE_DECOMPRESS set)
 - none (should be equivalent to FM_INCLUDE_DECOMPRESS unset)
 - zlib (stub for future work)

This lays the groundwork to support compression in addition to
decompression, using an external 3rd part library if desired.
@dzbaker dzbaker merged commit d524bf1 into nasa:main Feb 9, 2023
@jphickey jphickey deleted the fix-73-decompress branch March 7, 2023 16:22
@dmknutsen dmknutsen added this to the Equuleus milestone May 26, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conditional compile of Decompress File Cmd
4 participants