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 use of camlzip in byteweight #1609

Merged
merged 1 commit into from
Jul 29, 2024

Conversation

bmourad01
Copy link
Contributor

Addresses #1607, taking the suggestion by @xavierleroy

@ivg ivg merged commit bff05c4 into BinaryAnalysisPlatform:master Jul 29, 2024
2 of 8 checks passed
@ivg ivg mentioned this pull request Jul 29, 2024
List.iter entries ~f:(fun ({Zip.filename; extra; comment; mtime},data) ->
Zip.add_entry data zip filename
~extra ~comment ~mtime)
List.iter entries ~f:(fun ({Zip.filename; comment; mtime},data) ->

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you write the pattern as follows, you'll remain compatible with CamlZip < 1.12 while not triggering warning 9:

fun ({Zip.filename; comment; mtime; _},data) ->

@@ -283,7 +283,7 @@
(depends
(bap-signatures (= :version))
(bap-std (= :version))
(camlzip (and (>= 1.0) (< 2.0)))
(camlzip (and (>= 1.12) (< 2.0)))

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for >= 1.12 with the change I suggested.

@bmourad01
Copy link
Contributor Author

Thanks @xavierleroy, I have another PR #1610 for consideration

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.

3 participants