History

refactor: a simpler implementation to skip the header

Sebastian Thiel committed 6 years ago

Commit 47ca6ab1 parent ff350321 file · +5 −15Browse files

Unified · Split

git-odb/src/loose/mod.rs+5−15
@@ -26,22 +26,12 @@ pub mod io { · 25 unmodified lines
2626 r.read(buf)
2727 } else {
2828 // We must assure we return at least one byte - otherwise it's considered EOF, thus '>='
29− if *header_size_left >= buf.len() {
30− {
31− let mut tmp = [0u8; 32];
32− assert!(
33− *header_size_left <= tmp.len(),
34− "encountered unusually large header"
35− );
36− r.read_exact(&mut tmp[..*header_size_left])?;
37− *header_size_left = 0;
38− }
39− r.read(buf)
40− } else {
41− r.read_exact(&mut buf[..*header_size_left])?;
42− *header_size_left = 0;
43− r.read(buf)
29+ while *header_size_left != 0 {
30+ let bytes_to_read = buf.len().min(*header_size_left);
31+ r.read_exact(&mut buf[..bytes_to_read])?;
32+ *header_size_left -= bytes_to_read;
4433 }
34+ r.read(buf)
4535 }
4636 }
4737 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t