cry/nixide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Use c_char where appropriate

Browse source 
This builds on the previous commit to make it compatible with the
currently locked build configuration.

(cherry picked from commit bd1edec2fa5251263c768c3e2b312eb4f21d2bb4)
This commit is contained in:
Robert Hensing 2025-09-19 18:10:50 +02:00
parent c924fed81b
commit f7d4499ab2
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rust/nix-expr/src/eval_state.rs
View file

@ -284,7 +284,7 @@ impl EvalState {
let n = unsafe { check_call!(raw::get_attrs_size(&mut self.context, v.raw_ptr())) }?; let n = unsafe { check_call!(raw::get_attrs_size(&mut self.context, v.raw_ptr())) }?;
let mut attrs = Vec::with_capacity(n as usize); let mut attrs = Vec::with_capacity(n as usize);
for i in 0..n { for i in 0..n {
let cstr_ptr: *const u8 = unsafe { let cstr_ptr: *const c_char = unsafe {
check_call!(raw::get_attr_name_byidx( check_call!(raw::get_attr_name_byidx(
&mut self.context, &mut self.context,
v.raw_ptr(), v.raw_ptr(),

6
rust/nix-flake/src/lib.rs
View file

@ -1,4 +1,4 @@
use std::{ffi::CString, ptr::NonNull}; use std::{ffi::CString, os::raw::c_char, ptr::NonNull};
use anyhow::{Context as _, Result}; use anyhow::{Context as _, Result};
use nix_c_raw as raw; use nix_c_raw as raw;
@ -87,7 +87,7 @@ impl FlakeReferenceParseFlags {
context::check_call!(raw::flake_reference_parse_flags_set_base_directory( context::check_call!(raw::flake_reference_parse_flags_set_base_directory(
&mut ctx, &mut ctx,
self.ptr.as_ptr(), self.ptr.as_ptr(),
base_directory.as_ptr() as *const u8, base_directory.as_ptr() as *const c_char,
base_directory.len() base_directory.len()
)) ))
}?; }?;
@ -125,7 +125,7 @@ impl FlakeReference {
fetch_settings.raw_ptr(), fetch_settings.raw_ptr(),
flake_settings.ptr, flake_settings.ptr,
flags.ptr.as_ptr(), flags.ptr.as_ptr(),
reference.as_ptr() as *const u8, reference.as_ptr() as *const c_char,
reference.len(), reference.len(),
// pointer to ptr // pointer to ptr
&mut ptr, &mut ptr,

3
rust/nix-util/src/context.rs
View file

@ -1,5 +1,6 @@
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use nix_c_raw as raw; use nix_c_raw as raw;
use std::os::raw::c_char;
use std::ptr::null_mut; use std::ptr::null_mut;
use std::ptr::NonNull; use std::ptr::NonNull;
@ -50,7 +51,7 @@ impl Context {
raw::set_err_msg( raw::set_err_msg(
self.inner.as_ptr(), self.inner.as_ptr(),
raw::err_NIX_OK, raw::err_NIX_OK,
b"\0".as_ptr() as *const u8, b"\0".as_ptr() as *const c_char,
); );
} }
} }