Mercurial > crates > nonstick

diff src/libpam/question.rs @ 148:4b3a5095f68c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move libpam-sys helpers into their own library. - Renames libpam-sys-helpers to libpam-sys-consts. - Moves libpam-sys-helpers::helpers into libpam-sys-helpers, which moves them completely out of libpam-sys's dependency chain. - Moves the aliases from libpam-sys into libpam-sys::aliases.
author Paul Fisher <paul@pfish.zone>
date Mon, 07 Jul 2025 12:11:43 -0400
parents ebb71a412b58
children 4d11b2e7da83
line wrap: on
line diff
--- a/src/libpam/question.rs	Sun Jul 06 19:23:02 2025 -0400
+++ b/src/libpam/question.rs	Mon Jul 07 12:11:43 2025 -0400
@@ -5,7 +5,7 @@
 use crate::libpam::memory;
 use crate::ErrorCode;
 use crate::Result;
-use libpam_sys_helpers::memory as pam_mem;
+use libpam_sys_helpers as libpam_sys_helpers;
 use num_enum::{IntoPrimitive, TryFromPrimitive};
 use std::ffi::{c_int, c_void, CStr, OsStr};
 use std::os::unix::ffi::OsStrExt;
@@ -81,7 +81,7 @@
     unsafe fn binary_data(&self) -> (&[u8], u8) {
         self.data
             .as_ref()
-            .map(|data| pam_mem::BinaryPayload::contents(data.as_ptr().cast()))
+            .map(|data| libpam_sys_helpers::BinaryPayload::contents(data.as_ptr().cast()))
             .unwrap_or_default()
     }
 }
@@ -135,7 +135,7 @@
                     Style::BinaryPrompt => self
                         .data
                         .as_mut()
-                        .map(|p| pam_mem::BinaryPayload::zero(p.as_ptr().cast())),
+                        .map(|p| libpam_sys_helpers::BinaryPayload::zero(p.as_ptr().cast())),
                     #[cfg(feature = "linux-pam-ext")]
                     Style::RadioType => self
                         .data
@@ -187,8 +187,8 @@
 }
 
 #[cfg(feature = "linux-pam-ext")]
-impl From<pam_mem::TooBigError> for ErrorCode {
-    fn from(_: pam_mem::TooBigError) -> Self {
+impl From<libpam_sys_helpers::TooBigError> for ErrorCode {
+    fn from(_: libpam_sys_helpers::TooBigError) -> Self {
         ErrorCode::BufferError
     }
 }