packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2119 from cgwalters/bumpsplit-rustfmt 

bupsplit: rustfmt(*)
This commit is contained in:
OpenShift Merge Robot 2020-06-02 18:22:48 +02:00 committed by GitHub
parent d6ce1b09cf 97cda7ff4d
commit 12937211e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rust/.gitignore vendored Normal file
View File

@ -0,0 +1,2 @@
Cargo.lock
target/

40
rust/src/bupsplit.rs
View File

@ -43,9 +43,9 @@ const ROLLSUM_CHAR_OFFSET: u32 = 31;
// Previously in the header file // Previously in the header file
const BUP_BLOBBITS: u32 = 13; const BUP_BLOBBITS: u32 = 13;
const BUP_BLOBSIZE: u32 = (1<<BUP_BLOBBITS); const BUP_BLOBSIZE: u32 = 1 << BUP_BLOBBITS;
const BUP_WINDOWBITS: u32 = 7; const BUP_WINDOWBITS: u32 = 7;
const BUP_WINDOWSIZE: u32 = (1<<(BUP_WINDOWBITS-1)); const BUP_WINDOWSIZE: u32 = 1 << BUP_WINDOWBITS - 1;
struct Rollsum { struct Rollsum {
s1: u32, s1: u32,
@ -56,10 +56,11 @@ struct Rollsum {
impl Rollsum { impl Rollsum {
pub fn new() -> Rollsum { pub fn new() -> Rollsum {
Rollsum { s1: BUP_WINDOWSIZE * ROLLSUM_CHAR_OFFSET, Rollsum {
s2: BUP_WINDOWSIZE * (BUP_WINDOWSIZE-1) * ROLLSUM_CHAR_OFFSET, s1: BUP_WINDOWSIZE * ROLLSUM_CHAR_OFFSET,
window: [0; 64], s2: BUP_WINDOWSIZE * (BUP_WINDOWSIZE - 1) * ROLLSUM_CHAR_OFFSET,
wofs: 0 window: [0; 64],
wofs: 0,
} }
} }
@ -67,8 +68,13 @@ impl Rollsum {
pub fn add(&mut self, drop: u8, add: u8) -> () { pub fn add(&mut self, drop: u8, add: u8) -> () {
let drop_expanded = u32::from(drop); let drop_expanded = u32::from(drop);
let add_expanded = u32::from(add); let add_expanded = u32::from(add);
self.s1 = self.s1.wrapping_add(add_expanded.wrapping_sub(drop_expanded)); self.s1 = self
self.s2 = self.s2.wrapping_add(self.s1.wrapping_sub(BUP_WINDOWSIZE * (drop_expanded + ROLLSUM_CHAR_OFFSET))); .s1
.wrapping_add(add_expanded.wrapping_sub(drop_expanded));
self.s2 = self.s2.wrapping_add(
self.s1
.wrapping_sub(BUP_WINDOWSIZE * (drop_expanded + ROLLSUM_CHAR_OFFSET)),
);
} }
pub fn roll(&mut self, ch: u8) -> () { pub fn roll(&mut self, ch: u8) -> () {
@ -85,7 +91,7 @@ impl Rollsum {
} }
#[no_mangle] #[no_mangle]
pub extern fn bupsplit_sum(buf: *const u8, ofs: libc::size_t, len: libc::size_t) -> u32 { pub extern "C" fn bupsplit_sum(buf: *const u8, ofs: libc::size_t, len: libc::size_t) -> u32 {
let sbuf = unsafe { let sbuf = unsafe {
assert!(!buf.is_null()); assert!(!buf.is_null());
slice::from_raw_parts(buf.offset(ofs as isize), (len - ofs) as usize) slice::from_raw_parts(buf.offset(ofs as isize), (len - ofs) as usize)
@ -99,9 +105,11 @@ pub extern fn bupsplit_sum(buf: *const u8, ofs: libc::size_t, len: libc::size_t)
} }
#[no_mangle] #[no_mangle]
pub extern fn bupsplit_find_ofs(buf: *const u8, len: libc::size_t, pub extern "C" fn bupsplit_find_ofs(
bits: *mut libc::c_int) -> libc::c_int buf: *const u8,
{ len: libc::size_t,
bits: *mut libc::c_int,
) -> libc::c_int {
if buf.is_null() { if buf.is_null() {
return 0; return 0;
} }
@ -110,10 +118,10 @@ pub extern fn bupsplit_find_ofs(buf: *const u8, len: libc::size_t,
let mut r = Rollsum::new(); let mut r = Rollsum::new();
for x in sbuf { for x in sbuf {
r.roll(*x); r.roll(*x);
if (r.s2 & (BUP_BLOBSIZE-1)) == ((u32::max_value()) & (BUP_BLOBSIZE-1)) { if (r.s2 & (BUP_BLOBSIZE - 1)) == ((u32::max_value()) & (BUP_BLOBSIZE - 1)) {
if !bits.is_null() { if !bits.is_null() {
let mut sum = r.digest() >> BUP_BLOBBITS; let mut sum = r.digest() >> BUP_BLOBBITS;
let mut rbits : libc::c_int = BUP_BLOBBITS as i32; let mut rbits: libc::c_int = BUP_BLOBBITS as i32;
while sum & 1 != 0 { while sum & 1 != 0 {
sum >>= 1; sum >>= 1;
rbits += 1; rbits += 1;
@ -122,7 +130,7 @@ pub extern fn bupsplit_find_ofs(buf: *const u8, len: libc::size_t,
*bits = rbits; *bits = rbits;
} }
} }
return len as i32 return len as i32;
} }
} }
0 0