Ticket #839: null-pointer-removal-and-simplification.patch

File null-pointer-removal-and-simplification.patch, 1.3 KB (added by sjamaan, 11 years ago)

Remove deprecated null-pointer? predicate and simplify code

  • lzma.scm

     
    1717(define _free (foreign-lambda void "lzma_free" c-pointer))
    1818
    1919(define (decompress inblob)
    20    (let ((ptr (_decompress inblob (blob-size inblob))))
    21       (if (null-pointer? ptr)
    22          #f
    23          (let ((outblob (make-blob lzma-return-buffer-len)))
    24             (begin
    25                (move-memory! ptr outblob lzma-return-buffer-len)
    26                (_free ptr)
    27                outblob)))))
     20   (and-let* ((ptr (_decompress inblob (blob-size inblob)))
     21              (outblob (make-blob lzma-return-buffer-len)))
     22     (move-memory! ptr outblob lzma-return-buffer-len)
     23     (_free ptr)
     24     outblob))
    2825
    2926(define (compress inblob)
    30    (let ((ptr (_compress inblob (blob-size inblob))))
    31       (if (null-pointer? ptr)
    32          #f
    33          (let ((outblob (make-blob lzma-return-buffer-len)))
    34             (begin
    35                (move-memory! ptr outblob lzma-return-buffer-len)
    36                (_free ptr)
    37                outblob))))))
     27   (and-let* ((ptr (_compress inblob (blob-size inblob)))
     28              (outblob (make-blob lzma-return-buffer-len)))
     29     (move-memory! ptr outblob lzma-return-buffer-len)
     30     (_free ptr)
     31     outblob)))