aboutsummaryrefslogtreecommitdiffstats
path: root/core/isolinux.asm
diff options
context:
space:
mode:
authorSebastian Herbszt <herbszt@gmx.de>2008-07-17 01:13:48 +0200
committerH. Peter Anvin <hpa@zytor.com>2008-07-16 20:36:30 -0700
commitfa6a60e177786fea2b834691a66319fd3b177038 (patch)
tree1054023e67900a6adb2efe2be283f0bec92f3822 /core/isolinux.asm
parentf366ed45ba285e978a5f7c912a52efe2923e8813 (diff)
downloadsyslinux-fa6a60e177786fea2b834691a66319fd3b177038.tar.gz
isolinux: rename CurDir to CurrentDir
ldlinux and extlinux are both using CurrentDir variable name. Rename CurDir to make it consistent with those. - Sebastian
Diffstat (limited to 'core/isolinux.asm')
-rw-r--r--core/isolinux.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 69023700..f7c13669 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -111,7 +111,7 @@ trackbuf resb trackbufsize ; Track buffer goes here
alignb 4
ISOFileName resb 64 ; ISO filename canonicalization buffer
ISOFileNameEnd equ $
-CurDir resb dir_t_size ; Current directory
+CurrentDir resb dir_t_size ; Current directory
RootDir resb dir_t_size ; Root directory
FirstSecSum resd 1 ; Checksum of bytes 64-2048
ImageDwords resd 1 ; isolinux.bin size, dwords
@@ -891,7 +891,7 @@ get_fs_structures:
mov eax,[trackbuf+156+2]
mov [RootDir+dir_lba],eax
- mov [CurDir+dir_lba],eax
+ mov [CurrentDir+dir_lba],eax
%ifdef DEBUG_MESSAGES
mov si,dbg_rootdir_msg
call writemsg
@@ -900,11 +900,11 @@ get_fs_structures:
%endif
mov eax,[trackbuf+156+10]
mov [RootDir+dir_len],eax
- mov [CurDir+dir_len],eax
+ mov [CurrentDir+dir_len],eax
add eax,SECTOR_SIZE-1
shr eax,SECTOR_SHIFT
mov [RootDir+dir_clust],eax
- mov [CurDir+dir_clust],eax
+ mov [CurrentDir+dir_clust],eax
; Look for an isolinux directory, and if found,
; make it the current directory instead of the root
@@ -918,12 +918,12 @@ get_fs_structures:
call searchdir_iso
jz .no_isolinux_dir
.found_dir:
- mov [CurDir+dir_len],eax
+ mov [CurrentDir+dir_len],eax
mov eax,[si+file_left]
- mov [CurDir+dir_clust],eax
+ mov [CurrentDir+dir_clust],eax
xor eax,eax ; Free this file pointer entry
xchg eax,[si+file_sector]
- mov [CurDir+dir_lba],eax
+ mov [CurrentDir+dir_lba],eax
%ifdef DEBUG_MESSAGES
push si
mov si,dbg_isodir_msg
@@ -1138,7 +1138,7 @@ searchdir_iso:
push es
push ds
pop es ; ES = DS
- mov si,CurDir
+ mov si,CurrentDir
cmp byte [di],'/' ; If filename begins with slash
jne .not_rooted
inc di ; Skip leading slash