From: Nikodemus Siivola <nikodemus@random-state.net>
Date: Thu, 9 Oct 2008 10:41:24 +0000 (+0000)
Subject: 1.0.21.14: fix CHECK-FASL-HEADER buglet
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=b9519773faa7b3c98915eccb9cb1fd8a8270ee56;p=sbcl.git

1.0.21.14: fix CHECK-FASL-HEADER buglet

 * Problems with signaling and reporting INVALID-FASL-HEADER: it's
   :BYTE-NR 0, not :FIRST-BYTE t these days, and expected and actual
   bytes wre reversed in error output.
---

diff --git a/src/code/load.lisp b/src/code/load.lisp
index 4c7ce9c..33ae08d 100644
--- a/src/code/load.lisp
+++ b/src/code/load.lisp
@@ -230,8 +230,8 @@
                      position ~A: Expected ~A, got ~A.~:@>"
              (invalid-fasl-stream condition)
              (invalid-fasl-byte-nr condition)
-             (invalid-fasl-byte condition)
-             (invalid-fasl-expected condition)))))
+             (invalid-fasl-expected condition)
+             (invalid-fasl-byte condition)))))
 
 (define-condition invalid-fasl-version (invalid-fasl)
   ((version :reader invalid-fasl-version :initarg :version))
@@ -290,7 +290,7 @@
         (unless (= byte (char-code (schar fhsss 0)))
           (error 'invalid-fasl-header
                  :stream stream
-                 :first-byte-p t
+                 :byte-nr 0
                  :byte byte
                  :expected (char-code (schar fhsss 0))))
         (do ((byte (read-byte stream) (read-byte stream))
diff --git a/version.lisp-expr b/version.lisp-expr
index c664e73..2ec79f5 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.21.13"
+"1.0.21.14"