Skip to content

Commit

Permalink
Fix clippy warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
shaqq authored and danobi committed May 10, 2021
1 parent 8462373 commit ba44fd5
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
9 changes: 6 additions & 3 deletions libbpf-cargo/src/btf/btf.rs
Expand Up @@ -22,9 +22,12 @@ pub struct Btf<'a> {
impl<'a> Btf<'a> {
pub fn new(name: &str, object_file: &[u8]) -> Result<Option<Self>> {
let cname = CString::new(name)?;
let mut obj_opts = libbpf_sys::bpf_object_open_opts::default();
obj_opts.sz = std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t;
obj_opts.object_name = cname.as_ptr();
let obj_opts = libbpf_sys::bpf_object_open_opts {
sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
object_name: cname.as_ptr(),
..Default::default()
};

let bpf_obj = unsafe {
libbpf_sys::bpf_object__open_mem(
object_file.as_ptr() as *const c_void,
Expand Down
9 changes: 6 additions & 3 deletions libbpf-cargo/src/gen.rs
Expand Up @@ -538,9 +538,12 @@ fn gen_skel_link_getter(

fn open_bpf_object(name: &str, data: &[u8]) -> Result<*mut libbpf_sys::bpf_object> {
let cname = CString::new(name)?;
let mut obj_opts = libbpf_sys::bpf_object_open_opts::default();
obj_opts.sz = std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t;
obj_opts.object_name = cname.as_ptr();
let obj_opts = libbpf_sys::bpf_object_open_opts {
sz: std::mem::size_of::<libbpf_sys::bpf_object_open_opts>() as libbpf_sys::size_t,
object_name: cname.as_ptr(),
..Default::default()
};

let object = unsafe {
libbpf_sys::bpf_object__open_mem(
data.as_ptr() as *const c_void,
Expand Down
5 changes: 3 additions & 2 deletions libbpf-cargo/src/metadata.rs
@@ -1,4 +1,5 @@
use std::fs;
use std::path::Path;
use std::path::PathBuf;

use anyhow::{bail, Result};
Expand Down Expand Up @@ -33,7 +34,7 @@ pub struct UnprocessedObj {
fn get_package(
debug: bool,
package: &Package,
workspace_target_dir: &PathBuf,
workspace_target_dir: &Path,
) -> Result<Vec<UnprocessedObj>> {
if debug {
println!("Metadata for package={}", package.name);
Expand Down Expand Up @@ -65,7 +66,7 @@ fn get_package(
};

// Respect custom target directories specified by package
let mut target_dir = workspace_target_dir.clone();
let mut target_dir = workspace_target_dir.to_path_buf();
let out_dir = if let Some(d) = package_metadata.target_dir {
if debug {
println!("Custom target_dir={}", d.to_string_lossy());
Expand Down
8 changes: 4 additions & 4 deletions libbpf-rs/src/skeleton.rs
Expand Up @@ -165,10 +165,10 @@ impl<'a> ObjectSkeletonConfigBuilder<'a> {
// Holds `CString`s alive so pointers to them stay valid
let mut string_pool = Vec::new();

// NB: use default() to zero out struct
let mut s = bpf_object_skeleton::default();

s.sz = size_of::<bpf_object_skeleton>() as u64;
let mut s = libbpf_sys::bpf_object_skeleton {
sz: size_of::<bpf_object_skeleton>() as u64,
..Default::default()
};

if let Some(ref n) = self.name {
s.name = str_to_cstring_and_pool(&n, &mut string_pool)?;
Expand Down

0 comments on commit ba44fd5

Please sign in to comment.