aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--comboot.inc3
-rw-r--r--extlinux.asm4
-rw-r--r--getc.inc3
-rw-r--r--isolinux.asm4
-rw-r--r--ldlinux.asm4
-rw-r--r--pxelinux.asm4
6 files changed, 12 insertions, 10 deletions
diff --git a/comboot.inc b/comboot.inc
index 4896e392..034f924c 100644
--- a/comboot.inc
+++ b/comboot.inc
@@ -434,10 +434,7 @@ comapi_read:
;
comapi_close:
mov si,P_SI
- and si,si
- jz .nothing
call close_file
-.nothing:
clc
ret
diff --git a/extlinux.asm b/extlinux.asm
index 7d735073..a590a366 100644
--- a/extlinux.asm
+++ b/extlinux.asm
@@ -1039,8 +1039,10 @@ ThisInode resb EXT2_GOOD_OLD_INODE_SIZE ; The most recently opened inode
; Assumes CS == DS.
;
close_file:
+ and si,si
+ jz .closed
mov dword [si],0 ; First dword == file_left
- ret
+.closed: ret
;
; searchdir:
diff --git a/getc.inc b/getc.inc
index 610d01be..5c8dc862 100644
--- a/getc.inc
+++ b/getc.inc
@@ -162,9 +162,6 @@ close:
push si
mov bx,[CurrentGetC]
mov si,[bx+gc_file]
- and si,si
- jz .closed
-.closed:
call close_file
add bx,getc_file_size
mov [CurrentGetC],bx
diff --git a/isolinux.asm b/isolinux.asm
index de4f1646..f9e8741d 100644
--- a/isolinux.asm
+++ b/isolinux.asm
@@ -1143,8 +1143,10 @@ local_boot:
; Assumes CS == DS.
;
close_file:
+ and si,si
+ jz .closed
mov dword [si],0 ; First dword == file_left
- ret
+.closed: ret
;
; searchdir:
diff --git a/ldlinux.asm b/ldlinux.asm
index 7d7b8f23..eed29519 100644
--- a/ldlinux.asm
+++ b/ldlinux.asm
@@ -1065,8 +1065,10 @@ search_dos_dir:
; Assumes CS == DS.
;
close_file:
+ and si,si
+ jz .closed
mov dword [si],0 ; First dword == file_left
- ret
+.closed: ret
;
; searchdir:
diff --git a/pxelinux.asm b/pxelinux.asm
index 253aa0f1..3e50245f 100644
--- a/pxelinux.asm
+++ b/pxelinux.asm
@@ -1078,8 +1078,10 @@ memory_scan_for_pxenv_struct:
; side and send a courtesy ERROR packet to the server.
;
close_file:
+ and si,si
+ jz .closed
mov word [si],0 ; Not in use
- ret
+.closed: ret
;
; searchdir: