Skip to content

Clam 2427 dead code#1217

Merged
val-ms merged 6 commits intoCisco-Talos:mainfrom
val-ms:CLAM-2427-coverity-issues-dead-code
Apr 13, 2024
Merged

Clam 2427 dead code#1217
val-ms merged 6 commits intoCisco-Talos:mainfrom
val-ms:CLAM-2427-coverity-issues-dead-code

Conversation

@val-ms
Copy link
Contributor

@val-ms val-ms commented Mar 26, 2024

This PR removes a bunch of preprocessor checks around dead code for build configurations that are no longer supported (e.g. no bzip2, no pcre2, using pcre instead of pcre2, no libxml2, no json-c).

This "resolves" some coverity issues found in said dead code, and should make the code easier to understand and maintain.

@val-ms val-ms requested a review from ragusaa March 26, 2024 16:12
@ragusaa
Copy link
Contributor

ragusaa commented Mar 28, 2024

The changes look fine, and the unit tests pass.

It would still be good to do a regression run after this is merged, since there are so many changes.

val-ms added 6 commits April 12, 2024 13:37
As of ClamAV 0.105, PCRE2 is required. PCRE (1) is not an option, and
there is also no option to disable PCRE support.

This commit removes the dead code associated with those old build
options.
As of ClamAV 0.105, libxml2 is required.
There is also no option to disable PCRE support.

This commit removes the dead code associated with the old build
option.
As of ClamAV 0.105, libbz2 is required.
There is also no option to disable bz2 support.

This commit removes the dead code associated with the old build
option.
As of ClamAV 0.105, libz is required.
There is also no option to disable zlib support.

This commit removes the dead code associated with the old build
option.
As of ClamAV 0.105, libjson-c is required.
There is also no option to disable libjson-c support.

This commit removes the dead code associated with the old build
option.
@val-ms val-ms force-pushed the CLAM-2427-coverity-issues-dead-code branch from 2e8a28a to 4c7e8c1 Compare April 12, 2024 17:38
@val-ms
Copy link
Contributor Author

val-ms commented Apr 12, 2024

The changes look fine, and the unit tests pass.

It would still be good to do a regression run after this is merged, since there are so many changes.

Yeah we'll definitely at least regression test the release candidate vs the 1.3.1 release. And it couldn't hurt to regression test sooner.

@val-ms
Copy link
Contributor Author

val-ms commented Apr 12, 2024

I just rebased and force-pushed.

@val-ms val-ms merged commit ff0590a into Cisco-Talos:main Apr 13, 2024
@val-ms val-ms deleted the CLAM-2427-coverity-issues-dead-code branch April 13, 2024 16:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants