The spans do now contain the size of a span, no longer the end offset.

[cc65] / libsrc / common / fclose.s

diff --git a/libsrc/common/fclose.s b/libsrc/common/fclose.s
index 8acf4916695e52a0ac45986ba57e9585d6878f84..5365d70daf2e07db0d23d670416d95bf3271c79e 100644 (file)
--- a/libsrc/common/fclose.s
+++ b/libsrc/common/fclose.s
@@ -8,7 +8,7 @@
         .export         _fclose
 
         .import         _close
-        .importzp       ptr1                                   
+        .importzp       ptr1
 
         .include        "errno.inc"
         .include        "_file.inc"
@@ -23,7 +23,7 @@
 
 ; Check if the file is really open
 
-        ldy     #_FILE_f_flags
+        ldy     #_FILE::f_flags
         lda     (ptr1),y
         and     #_FOPEN
         bne     @L1
@@ -31,11 +31,9 @@
 ; File is not open
 
         lda     #EINVAL
-        sta     __errno
-        ldx     #0
-        stx     __errno+1
-        dex
-        txa
+        jsr     __seterrno
+        lda     #$FF            ; Return -1
+        tax
         rts
 
 ; File is open. Reset the flags and close the file.
@@ -43,7 +41,7 @@
 @L1:    lda     #_FCLOSED
         sta     (ptr1),y
 
-        ldy     #_FILE_f_fd
+        ldy     #_FILE::f_fd
         lda     (ptr1),y
         ldx     #0
         jmp     _close          ; Will set errno and return an error flag