CA-211448: When reading a line from sysfs, translate End_of_file to "" #79
Conversation
This file contains hidden or 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
Some sysfs files are "empty", for a good reason. Signed-off-by: Rob Hoes <rob.hoes@citrix.com>
lib/network_utils.ml
Outdated
| with exn -> close_in inchan; raise (Read_error file) | ||
| with | ||
| | End_of_file -> close_in inchan; "" | ||
| | exn -> error "%s" (Printexc.to_string exn); close_in inchan; raise (Read_error file) |
Collaborator
There was a problem hiding this comment.
Looks OK, but might be neater as
let read_one_line file =
let inchan = open_in file in
try
finally
(fun () -> input_line inchan)
(fun () -> close_in inchan)
with
| End_of_file -> ""
| exn -> error "%s" (Printexc.to_string exn); raise (Read_error file)
Contributor
There was a problem hiding this comment.
The open_in could also fail. So it could also go inside the try and the error could be handled in the with block.
Member
Author
There was a problem hiding this comment.
All agreed; will update.
Member
Author
|
@johnelse I've added a fixup. Will squash it before merging. |
Collaborator
|
Looks good! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Some sysfs files are "empty", for a good reason.
Signed-off-by: Rob Hoes rob.hoes@citrix.com