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

[core]: Fix name conflict with md5 functions #2301

Merged
merged 1 commit into from
Apr 20, 2022
Merged

[core]: Fix name conflict with md5 functions #2301

merged 1 commit into from
Apr 20, 2022

Conversation

Biswa96
Copy link
Contributor

@Biswa96 Biswa96 commented Apr 19, 2022

This renames the private md5 functions by adding srt_ prefix.
Otherwise, the md5 functions are shown as multiple definition
while static linking in presence of other libraries.

@codecov-commenter
Copy link

Codecov Report

Merging #2301 (705fb4a) into master (1cd39b9) will decrease coverage by 0.02%.
The diff coverage is 90.90%.

@@            Coverage Diff             @@
##           master    #2301      +/-   ##
==========================================
- Coverage   65.78%   65.76%   -0.03%     
==========================================
  Files          95       95              
  Lines       19524    19524              
==========================================
- Hits        12843    12839       -4     
- Misses       6681     6685       +4     
Impacted Files Coverage Δ
srtcore/md5.cpp 92.24% <87.50%> (ø)
srtcore/common.cpp 38.24% <100.00%> (ø)
srtcore/list.cpp 76.71% <0.00%> (-4.94%) ⬇️
test/test_bonding.cpp 97.84% <0.00%> (-0.54%) ⬇️
srtcore/api.cpp 51.55% <0.00%> (-0.11%) ⬇️
srtcore/core.cpp 59.81% <0.00%> (+0.09%) ⬆️
srtcore/buffer.cpp 66.76% <0.00%> (+0.57%) ⬆️
srtcore/queue.cpp 80.84% <0.00%> (+1.16%) ⬆️
srtcore/congctl.cpp 80.72% <0.00%> (+1.56%) ⬆️

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@maxsharabayko
Copy link
Collaborator

Hi @Biswa96
Thank you for the PR. Indeed a good fix. I would rather suggest putting those functions inside the srt namespace instead of renaming them.

(Related issue #1924)

@maxsharabayko maxsharabayko added Type: Maintenance Work required to maintain or clean up the code [core] Area: Changes in SRT library core labels Apr 19, 2022
@Biswa96
Copy link
Contributor Author

Biswa96 commented Apr 19, 2022

Done.

This wraps up the private md5 functions inside srt namespace.
Otherwise, the md5 functions are shown as multiple definition
while static linking in presence of other libraries.
srtcore/md5.h Show resolved Hide resolved
@maxsharabayko maxsharabayko merged commit 911de75 into Haivision:master Apr 20, 2022
@Biswa96 Biswa96 deleted the md5-conflict branch April 20, 2022 15:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[core] Area: Changes in SRT library core Type: Maintenance Work required to maintain or clean up the code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants