summary refs log tree commit diff
path: root/sys_util/src/syslog.rs
diff options
context:
space:
mode:
authorZach Reizner <zachr@google.com>2017-08-30 17:07:01 -0700
committerchrome-bot <chrome-bot@chromium.org>2017-09-01 12:39:18 -0700
commit3cbded2c51574bfdefe8d26a9c6ff235c7330b59 (patch)
tree6e891f47d965e42c47c254094b17b6813ca8dd09 /sys_util/src/syslog.rs
parent86fb9567b588a11ed1f7ed2e3223c25fad07cc6f (diff)
downloadcrosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar.gz
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar.bz2
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar.lz
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar.xz
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.tar.zst
crosvm-3cbded2c51574bfdefe8d26a9c6ff235c7330b59.zip
fix armv7a and aarch64 build errors and warnings
BUG=None
TEST=cargo build --target=armv7a-cros-linux-gnueabi &&
     cargo build --target=aarch64-cros-linux-gnu

Change-Id: I954c152f3c8086e24c4809dd5aabb5043fdd63af
Reviewed-on: https://chromium-review.googlesource.com/644408
Commit-Ready: Zach Reizner <zachr@chromium.org>
Tested-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Jason Clinton <jclinton@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'sys_util/src/syslog.rs')
-rw-r--r--sys_util/src/syslog.rs11
1 files changed, 2 insertions, 9 deletions
diff --git a/sys_util/src/syslog.rs b/sys_util/src/syslog.rs
index 1a3e6ee..12996f8 100644
--- a/sys_util/src/syslog.rs
+++ b/sys_util/src/syslog.rs
@@ -38,9 +38,9 @@ use std::result;
 use std::str::from_utf8;
 use std::sync::{Mutex, MutexGuard, Once, ONCE_INIT};
 
-use libc::{tm, time, time_t, localtime_r, gethostname, c_char, syscall};
+use libc::{tm, time, time_t, localtime_r, gethostname, c_char};
 
-use syscall_defines::linux::LinuxSyscall::SYS_getpid;
+use getpid;
 
 const SYSLOG_PATH: &'static str = "/dev/log";
 
@@ -293,13 +293,6 @@ fn send_buf(socket: &UnixDatagram, buf: &[u8]) {
     }
 }
 
-// This bypasses libc's caching getpid() wrapper which can be invalid if a raw clone was used
-// elsewhere.
-fn getpid() -> i32 {
-    // Safe because this syscall can never fail and we give it a valid syscall number.
-    unsafe { syscall(SYS_getpid as i64) as i32 }
-}
-
 fn get_localtime() -> tm {
     unsafe {
         // Safe because tm is just a struct of plain data.