Remove unpackByteStringCStringLen

IntersectMBO · Jun 21, 2023 · 00c4e4e · 00c4e4e
1 parent 1e67222
commit 00c4e4e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 16 deletions.
diff --git a/cardano-crypto-class/src/Cardano/Crypto/Libsodium/Memory.hs b/cardano-crypto-class/src/Cardano/Crypto/Libsodium/Memory.hs
@@ -26,7 +26,6 @@ module Cardano.Crypto.Libsodium.Memory (
   allocaBytes,
 
   -- * ByteString memory access, generalized to 'MonadST'
-  unpackByteStringCStringLen,
   packByteStringCStringLen,
 ) where
 

diff --git a/cardano-crypto-class/src/Cardano/Crypto/Libsodium/Memory/Internal.hs b/cardano-crypto-class/src/Cardano/Crypto/Libsodium/Memory/Internal.hs
@@ -34,7 +34,6 @@ module Cardano.Crypto.Libsodium.Memory.Internal (
   allocaBytes,
 
   -- * ByteString memory access, generalized to 'MonadST'
-  unpackByteStringCStringLen,
   packByteStringCStringLen,
 
   -- * Helper
@@ -50,10 +49,8 @@ import Control.Monad.ST
 import Control.Monad.ST.Unsafe (unsafeIOToST, unsafeSTToIO)
 import Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
-import qualified Data.ByteString.Unsafe as BS
 import Data.Coerce (coerce)
 import Data.Typeable
-import Data.Word (Word8)
 import Debug.Trace (traceShowM)
 import Foreign.C.Error (errnoToIOError, getErrno)
 import Foreign.C.String (CStringLen)
@@ -64,7 +61,7 @@ import Foreign.ForeignPtr.Unsafe (unsafeForeignPtrToPtr)
 import qualified Foreign.Marshal.Alloc as Foreign
 import Foreign.Marshal.Utils (fillBytes)
 import Foreign.Ptr (Ptr, nullPtr, castPtr)
-import Foreign.Storable (Storable (peek), sizeOf, alignment, pokeByteOff)
+import Foreign.Storable (Storable (peek), sizeOf, alignment)
 import GHC.IO.Exception (ioException)
 import GHC.TypeLits (KnownNat, natVal)
 import NoThunks.Class (NoThunks, OnlyCheckWhnfNamed (..))
@@ -195,17 +192,6 @@ allocaBytes :: Int -> (Ptr a -> ST s b) -> ST s b
 allocaBytes size f =
   unsafeIOToST $ Foreign.allocaBytes size (unsafeSTToIO . f)
 
--- | Unpacks a ByteString into a temporary buffer and runs the provided 'ST'
--- function on it.
-unpackByteStringCStringLen :: ByteString -> (CStringLen -> ST s a) -> ST s a
-unpackByteStringCStringLen bs f = do
-  let len = BS.length bs
-  allocaBytes (len + 1) $ \buf -> do
-    unsafeIOToST $ BS.unsafeUseAsCString bs $ \ptr -> do
-      copyMem buf ptr (fromIntegral len)
-      pokeByteOff buf len (0 :: Word8)
-    f (buf, len)
-
 packByteStringCStringLen :: MonadST m => CStringLen -> m ByteString
 packByteStringCStringLen (ptr, len) =
   withLiftST $ \lift -> lift . unsafeIOToST $ BS.packCStringLen (ptr, len)