Skip to content

Add alternate device_characteristics/sector_size methods which pass file handle #72

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.

Sign up for GitHub

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

Merged
carlsverre merged 1 commit into from
Feb 24, 2026
Merged

Add alternate device_characteristics/sector_size methods which pass file handle #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ pub trait Hooks {
) -> Result<Option<String>, PragmaErr> {
Err(PragmaErr::NotFound)
}
fn sector_size(&mut self) {}
fn device_characteristics(&mut self) {
fn sector_size(&mut self, handle: MockHandle) {}
fn device_characteristics(&mut self, handle: MockHandle) {
println!("device_characteristics");
}
}
Expand Down Expand Up @@ -297,17 +297,17 @@ impl Vfs for MockVfs {
state.hooks.pragma(*meta, pragma)
}

fn sector_size(&self) -> i32 {
fn sector_size(&self, handle: &mut Self::Handle) -> VfsResult<i32> {
let mut state = self.state();
state.log(format_args!("sector_size"));
state.hooks.sector_size();
DEFAULT_SECTOR_SIZE
state.hooks.sector_size(*handle);
Ok(DEFAULT_SECTOR_SIZE)
}

fn device_characteristics(&self) -> i32 {
fn device_characteristics(&self, handle: &mut Self::Handle) -> VfsResult<i32> {
let mut state = self.state();
state.log(format_args!("device_characteristics"));
state.hooks.device_characteristics();
DEFAULT_DEVICE_CHARACTERISTICS
state.hooks.device_characteristics(*handle);
Ok(DEFAULT_DEVICE_CHARACTERISTICS)
}
}
12 changes: 6 additions & 6 deletions src/vfs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,12 +179,12 @@ pub trait Vfs: Send + Sync {
}

// system queries
fn sector_size(&self) -> i32 {
DEFAULT_SECTOR_SIZE
fn sector_size(&self, handle: &mut Self::Handle) -> VfsResult<i32> {
Ok(DEFAULT_SECTOR_SIZE)
}

fn device_characteristics(&self) -> i32 {
DEFAULT_DEVICE_CHARACTERISTICS
fn device_characteristics(&self, handle: &mut Self::Handle) -> VfsResult<i32> {
Ok(DEFAULT_DEVICE_CHARACTERISTICS)
}
}

Expand Down Expand Up @@ -623,15 +623,15 @@ unsafe extern "C" fn x_sector_size<T: Vfs>(p_file: *mut ffi::sqlite3_file) -> c_
fallible(|| {
let file = unwrap_file!(p_file, T)?;
let vfs = unwrap_vfs!(file.vfs, T)?;
Ok(vfs.sector_size())
vfs.sector_size(unsafe { file.handle.assume_init_mut() })
})
}

unsafe extern "C" fn x_device_characteristics<T: Vfs>(p_file: *mut ffi::sqlite3_file) -> c_int {
fallible(|| {
let file = unwrap_file!(p_file, T)?;
let vfs = unwrap_vfs!(file.vfs, T)?;
Ok(vfs.device_characteristics())
vfs.device_characteristics(unsafe { file.handle.assume_init_mut() })
})
}

Expand Down
Loading