File tree 4 files changed +19
-12
lines changed
4 files changed +19
-12
lines changed Original file line number Diff line number Diff line change @@ -22,9 +22,12 @@ pub struct Btf<'a> {
22
22
impl < ' a > Btf < ' a > {
23
23
pub fn new ( name : & str , object_file : & [ u8 ] ) -> Result < Option < Self > > {
24
24
let cname = CString :: new ( name) ?;
25
- let mut obj_opts = libbpf_sys:: bpf_object_open_opts:: default ( ) ;
26
- obj_opts. sz = std:: mem:: size_of :: < libbpf_sys:: bpf_object_open_opts > ( ) as libbpf_sys:: size_t ;
27
- obj_opts. object_name = cname. as_ptr ( ) ;
25
+ let obj_opts = libbpf_sys:: bpf_object_open_opts {
26
+ sz : std:: mem:: size_of :: < libbpf_sys:: bpf_object_open_opts > ( ) as libbpf_sys:: size_t ,
27
+ object_name : cname. as_ptr ( ) ,
28
+ ..Default :: default ( )
29
+ } ;
30
+
28
31
let bpf_obj = unsafe {
29
32
libbpf_sys:: bpf_object__open_mem (
30
33
object_file. as_ptr ( ) as * const c_void ,
Original file line number Diff line number Diff line change @@ -538,9 +538,12 @@ fn gen_skel_link_getter(
538
538
539
539
fn open_bpf_object ( name : & str , data : & [ u8 ] ) -> Result < * mut libbpf_sys:: bpf_object > {
540
540
let cname = CString :: new ( name) ?;
541
- let mut obj_opts = libbpf_sys:: bpf_object_open_opts:: default ( ) ;
542
- obj_opts. sz = std:: mem:: size_of :: < libbpf_sys:: bpf_object_open_opts > ( ) as libbpf_sys:: size_t ;
543
- obj_opts. object_name = cname. as_ptr ( ) ;
541
+ let obj_opts = libbpf_sys:: bpf_object_open_opts {
542
+ sz : std:: mem:: size_of :: < libbpf_sys:: bpf_object_open_opts > ( ) as libbpf_sys:: size_t ,
543
+ object_name : cname. as_ptr ( ) ,
544
+ ..Default :: default ( )
545
+ } ;
546
+
544
547
let object = unsafe {
545
548
libbpf_sys:: bpf_object__open_mem (
546
549
data. as_ptr ( ) as * const c_void ,
Original file line number Diff line number Diff line change 1
1
use std:: fs;
2
+ use std:: path:: Path ;
2
3
use std:: path:: PathBuf ;
3
4
4
5
use anyhow:: { bail, Result } ;
@@ -33,7 +34,7 @@ pub struct UnprocessedObj {
33
34
fn get_package (
34
35
debug : bool ,
35
36
package : & Package ,
36
- workspace_target_dir : & PathBuf ,
37
+ workspace_target_dir : & Path ,
37
38
) -> Result < Vec < UnprocessedObj > > {
38
39
if debug {
39
40
println ! ( "Metadata for package={}" , package. name) ;
@@ -65,7 +66,7 @@ fn get_package(
65
66
} ;
66
67
67
68
// Respect custom target directories specified by package
68
- let mut target_dir = workspace_target_dir. clone ( ) ;
69
+ let mut target_dir = workspace_target_dir. to_path_buf ( ) ;
69
70
let out_dir = if let Some ( d) = package_metadata. target_dir {
70
71
if debug {
71
72
println ! ( "Custom target_dir={}" , d. to_string_lossy( ) ) ;
Original file line number Diff line number Diff line change @@ -165,10 +165,10 @@ impl<'a> ObjectSkeletonConfigBuilder<'a> {
165
165
// Holds `CString`s alive so pointers to them stay valid
166
166
let mut string_pool = Vec :: new ( ) ;
167
167
168
- // NB: use default() to zero out struct
169
- let mut s = bpf_object_skeleton :: default ( ) ;
170
-
171
- s . sz = size_of :: < bpf_object_skeleton > ( ) as u64 ;
168
+ let mut s = libbpf_sys :: bpf_object_skeleton {
169
+ sz : size_of :: < bpf_object_skeleton > ( ) as u64 ,
170
+ .. Default :: default ( )
171
+ } ;
172
172
173
173
if let Some ( ref n) = self . name {
174
174
s. name = str_to_cstring_and_pool ( & n, & mut string_pool) ?;
You can’t perform that action at this time.
0 commit comments