itsscb/tracing
1
0
Fork 0
mirror of https://github.com/tokio-rs/tracing.git synced 2025-09-29 22:10:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

journald: fix memfd_create_syscall for 32 bit targets (#1982) (#1995)

Browse Source 
On 32 bit targets (e.g. armv7) the syscall in memfd_create_syscall()
returns an i32, so this compilation error is printed:

| error[E0308]: mismatched types
|   --> .../tracing-journald-0.2.3/src/memfd.rs:27:9
|    |
| 25 |   fn memfd_create_syscall(flags: c_uint) -> i64 {
|    |                                             --- expected `i64`
|    |                                           because of return type
| 26 |       unsafe {
| 27 | /         syscall(
| 28 | |             SYS_memfd_create,
| 29 | |             "tracing-journald\0".as_ptr() as *const c_char,
| 30 | |             flags,
| 31 | |         )
|    | |_________^ expected `i64`, found `i32`
|    |
| help: you can convert an `i32` to an `i64`
|    |
| 31 |         ).into()
|    |          +++++++
|
| For more information about this error, try `rustc --explain E0308`.
| error: could not compile `tracing-journald` due to previous error
|

This commit fixes this issue.

Co-authored-by: Christian Taedcke <hacking@taedcke.com>
This commit is contained in:
Eliza Weisman 2022-03-17 10:23:27 -07:00 committed by GitHub
parent c6c8097879
commit 5287e7d0a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tracing-journald/src/memfd.rs
View File

@ -22,13 +22,13 @@ fn create(flags: c_uint) -> Result<File> {
/// RHEL 7, etc.
///
/// See: https://github.com/tokio-rs/tracing/issues/1879
fn memfd_create_syscall(flags: c_uint) -> i64 {
fn memfd_create_syscall(flags: c_uint) -> c_int {
unsafe {
syscall(
SYS_memfd_create,
"tracing-journald\0".as_ptr() as *const c_char,
flags,
)
) as c_int
}
}