From 446efcd8d809f98fa93d6cd814dd17838dbb79f0 Mon Sep 17 00:00:00 2001 From: Matthew LeVan Date: Fri, 16 Feb 2024 13:35:56 -0500 Subject: [PATCH] guard: touchups --- rust/ares/src/serf.rs | 2 +- rust/ares_guard/c-src/guard.c | 2 +- rust/ares_guard/src/lib.rs | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/rust/ares/src/serf.rs b/rust/ares/src/serf.rs index 70632f1..1f4aecc 100644 --- a/rust/ares/src/serf.rs +++ b/rust/ares/src/serf.rs @@ -605,7 +605,7 @@ fn work_swap(context: &mut Context, job: Noun, goof: Noun) { context.work_swap(ovo, fec); } Err(goof_crud) => { - eprintln!("\r serf: bail"); + eprintln!("\rserf: bail"); let stack = &mut context.nock_context.stack; let lud = T(stack, &[goof_crud, goof, D(0)]); context.work_bail(lud); diff --git a/rust/ares_guard/c-src/guard.c b/rust/ares_guard/c-src/guard.c index 4ec2565..6579e61 100644 --- a/rust/ares_guard/c-src/guard.c +++ b/rust/ares_guard/c-src/guard.c @@ -124,7 +124,7 @@ _signal_handler(int sig, siginfo_t *si, void *unused) // fprintf(stderr, "guard: hit: %p\r\n", si->si_addr); err = _focus_guard(); if (err) { - fprintf(stderr, "guard: handler: focus error\r\n"); + // fprintf(stderr, "guard: handler: focus error\r\n"); siglongjmp(buffer_list->buffer, err); } } diff --git a/rust/ares_guard/src/lib.rs b/rust/ares_guard/src/lib.rs index c10fb5a..66f12cd 100644 --- a/rust/ares_guard/src/lib.rs +++ b/rust/ares_guard/src/lib.rs @@ -4,9 +4,9 @@ include!(concat!(env!("OUT_DIR"), "/bindings.rs")); -pub const GUARD_NULL: u32 = guard_err_guard_null; -pub const GUARD_SIGNAL: u32 = guard_err_guard_signal; -pub const GUARD_OOM: u32 = guard_err_guard_oom; -pub const GUARD_MALLOC: u32 = guard_err_guard_malloc; -pub const GUARD_MPROTECT: u32 = guard_err_guard_mprotect; -pub const GUARD_SIGACTION: u32 = guard_err_guard_sigaction; +pub const GUARD_NULL: u32 = guard_result_guard_null; +pub const GUARD_SIGNAL: u32 = guard_result_guard_signal; +pub const GUARD_OOM: u32 = guard_result_guard_oom; +pub const GUARD_MALLOC: u32 = guard_result_guard_malloc; +pub const GUARD_MPROTECT: u32 = guard_result_guard_mprotect; +pub const GUARD_SIGACTION: u32 = guard_result_guard_sigaction;