Mechanically rename the writestr functions

Mechanically rename the writestr functions:

	writestr   -> writestr_early
	cwritestr  -> writestr

... to reflect which function is more appropriate to call in normal
circumstances.

15 files changed, 101 insertions, 101 deletions

diff --git a/core/abort.inc b/core/abort.inc
index 0f443829..12d00063 100644
--- a/core/abort.inc
+++ b/core/abort.inc
@@ -50,7 +50,7 @@ abort_load:
 		mov bx,error_or_command
 abort_load_chain:
 		RESET_STACK_AND_SEGS AX
-                call cwritestr                  ; Expects SI -> error msg
+                call writestr                  ; Expects SI -> error msg
 
 		; Return to the command prompt
 		jmp bx
diff --git a/core/comboot.inc b/core/comboot.inc
index 842b2f63..aede9de3 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -64,7 +64,7 @@
 comboot_too_large:
 		call close_file
 		mov si,err_comlarge
-		call cwritestr
+		call writestr
 		jmp enter_command
 
 ;
@@ -253,9 +253,9 @@ comboot_exit_msg:
 		call adjust_screen	; The COMBOOT program might have changed the screen
 		jcxz .nomsg
 		mov si,KernelCName
-		call cwritestr
+		call writestr
 		mov si,cx
-		call cwritestr
+		call writestr
 .nomsg:
 		jmp bx
 
@@ -397,7 +397,7 @@ comapi_nop:
 comapi_writestr:
 		mov ds,P_ES
 		mov si,P_BX
-		call writestr
+		call writestr_early
 		clc
 		ret
 
diff --git a/core/conio.inc b/core/conio.inc
index 0dc3f1d0..ddd8ccf9 100644
--- a/core/conio.inc
+++ b/core/conio.inc
@@ -14,8 +14,8 @@
 ;; conio.inc
 ;;
 ;; Console I/O code, except:
-;;   writechr, writestr		- module-dependent
-;;   cwritestr, crlf		- writestr.inc
+;;   writechr, writestr_early		- module-dependent
+;;   writestr, crlf		- writestr.inc
 ;;   writehex*			- writehex.inc
 ;;
 
diff --git a/core/cpuinit.inc b/core/cpuinit.inc
index fd62cc77..63250703 100644
--- a/core/cpuinit.inc
+++ b/core/cpuinit.inc
@@ -34,7 +34,7 @@ dosram_k	equ (real_mode_seg+0x1000) >> 6	; Minimum DOS memory (K)
 		cmp ax,dosram_k
 		jae enough_ram
 		mov si,err_noram
-		call writestr
+		call writestr_early
 		jmp kaboom
 enough_ram:
 skip_checks:
diff --git a/core/extlinux.asm b/core/extlinux.asm
index 1b969c7c..087fc3c1 100644
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -603,7 +603,7 @@ ldlinux_ent:
 ; Tell the user we got this far
 ;
 		mov si,syslinux_banner
-		call writestr
+		call writestr_early
 
 ;
 ; Tell the user if we're using EBIOS or CBIOS
@@ -615,7 +615,7 @@ print_bios:
 		mov si,ebios_name
 .cbios:
 		mov [BIOSName],si
-		call writestr
+		call writestr_early
 
 		section .bss
 %define	HAVE_BIOSNAME 1
@@ -677,7 +677,7 @@ verify_checksum:
 ; Uh-oh, something went bad...
 ;
 		mov si,checksumerr_msg
-		call writestr
+		call writestr_early
 		jmp kaboom
 
 ;
@@ -687,11 +687,11 @@ verify_checksum:
 
 ;
 ;
-; writestr: write a null-terminated string to the console
+; writestr_early: write a null-terminated string to the console
 ;	    This assumes we're on page 0.  This is only used for early
 ;           messages, so it should be OK.
 ;
-writestr:
+writestr_early:
 .loop:		lodsb
 		and al,al
                 jz .return
@@ -749,7 +749,7 @@ all_read:
 ; in Sector 1, but makes a lot more sense here.
 ;
 		mov si,copyright_str
-		call writestr
+		call writestr_early
 
 ;
 ; Insane hack to expand the DOS superblock to dwords
@@ -1309,7 +1309,7 @@ unmangle_name:	call strcpy
 
 kaboom2:
 		mov si,err_bootfailed
-		call cwritestr
+		call writestr
 		cmp byte [kaboom.again+1],18h	; INT 18h version?
 		je .int18
 		call getchar
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 52d426f9..fb91a9ef 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -242,10 +242,10 @@ _start1:	mov [cs:InitStack],sp		; Save initial stack pointer
 		cld
 		; Show signs of life
 		mov si,syslinux_banner
-		call writestr
+		call writestr_early
 %ifdef DEBUG_MESSAGES
 		mov si,copyright_str
-		call writestr
+		call writestr_early
 %endif
 
 		;
@@ -486,7 +486,7 @@ award_hack:	mov	si,spec_err_msg		; Moved to this place from
 						;
 		call	writehex8		;
 		mov	si,award_not_crlf	;
-		call	writestr		;
+		call	writestr_early		;
 %endif						;
 		push	es			; save ES
 		mov	ax,0f000h		; ES = BIOS Seg
@@ -532,7 +532,7 @@ award_found:	mov	eax,[es:di+0eh]		; load possible int 13 addr
 		pop	eax			;
 		call	writehex8		;
 		mov	si,award_not_crlf	;
-		call	writestr		;
+		call	writestr_early		;
 %endif						;
 		mov	ax,4B01h		; try to read the spec packet
 		mov	dl,[DriveNumber]	; now ... it should not fail
@@ -633,9 +633,9 @@ fatal_error:
 writemsg:	push ax
 		push si
 		mov si,isolinux_str
-		call writestr
+		call writestr_early
 		pop si
-		call writestr
+		call writestr_early
 		pop ax
 		ret
 
@@ -760,11 +760,11 @@ xint13:		mov byte [RetryCount],retry_count
 		mov al,[DiskError]
 		call writehex2
 		mov si,oncall_str
-		call writestr
+		call writestr_early
 		mov ax,[DiskSys]
 		call writehex4
 		mov si,ondrive_str
-		call writestr
+		call writestr_early
 		mov al,dl
 		call writehex2
 		call crlf
@@ -777,7 +777,7 @@ xint13:		mov byte [RetryCount],retry_count
 kaboom:
 		RESET_STACK_AND_SEGS AX
 		mov si,err_bootfailed
-		call cwritestr
+		call writestr
 		call getchar
 		cli
 		mov word [BIOS_magic],0	; Cold reboot
@@ -788,7 +788,7 @@ kaboom:
 ; -----------------------------------------------------------------------------
 
 %include "writestr.inc"		; String output
-writestr	equ cwritestr
+writestr_early	equ writestr
 %include "writehex.inc"		; Hexadecimal output
 
 ; -----------------------------------------------------------------------------
@@ -861,7 +861,7 @@ all_read:
 ; Tell the user we got this far...
 %ifndef DEBUG_MESSAGES			; Gets messy with debugging on
 		mov si,copyright_str
-		call writestr
+		call writestr_early
 %endif
 
 ;
@@ -1073,7 +1073,7 @@ is_disk_image:
 		; If this returns, we have problems
 .bad_image:
 		mov si,err_disk_image
-		call cwritestr
+		call writestr
 		jmp enter_command
 
 ;
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index 58235829..193bb064 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -623,7 +623,7 @@ ldlinux_ent:
 ; Tell the user we got this far
 ;
 		mov si,syslinux_banner
-		call writestr
+		call writestr_early
 
 ;
 ; Tell the user if we're using EBIOS or CBIOS
@@ -635,7 +635,7 @@ print_bios:
 		mov si,ebios_name
 .cbios:
 		mov [BIOSName],si
-		call writestr
+		call writestr_early
 
 		section .bss
 %define	HAVE_BIOSNAME 1
@@ -697,7 +697,7 @@ verify_checksum:
 ; Uh-oh, something went bad...
 ;
 		mov si,checksumerr_msg
-		call writestr
+		call writestr_early
 		jmp kaboom
 
 ;
@@ -707,11 +707,11 @@ verify_checksum:
 
 ;
 ;
-; writestr: write a null-terminated string to the console
+; writestr_early: write a null-terminated string to the console
 ;	    This assumes we're on page 0.  This is only used for early
 ;           messages, so it should be OK.
 ;
-writestr:
+writestr_early:
 .loop:		lodsb
 		and al,al
                 jz .return
@@ -769,7 +769,7 @@ all_read:
 ; in Sector 1, but makes a lot more sense here.
 ;
 		mov si,copyright_str
-		call writestr
+		call writestr_early
 
 
 ;
@@ -1281,7 +1281,7 @@ PrevDir		resd 1			; Last scanned directory
 
 kaboom2:
 		mov si,err_bootfailed
-		call cwritestr
+		call writestr
 		cmp byte [kaboom.again+1],18h	; INT 18h version?
 		je .int18
 		call getchar
diff --git a/core/localboot.inc b/core/localboot.inc
index ae54737a..62822570 100644
--- a/core/localboot.inc
+++ b/core/localboot.inc
@@ -30,7 +30,7 @@ local_boot:
 		mov fs,dx
 		mov gs,dx
 		mov si,localboot_msg
-		call writestr
+		call writestr_early
 		cmp ax,-1
 		je .int18
 
diff --git a/core/parsecmd.inc b/core/parsecmd.inc
index 8e648699..0c44eaf4 100644
--- a/core/parsecmd.inc
+++ b/core/parsecmd.inc
@@ -75,7 +75,7 @@ getcommand:
 		mov si,err_noparm
 		mov al,10		; Already at EOL
 .error:
-		call cwritestr
+		call writestr
 		jmp short .skipline
 
 .found_keywd:	lodsw			; Load argument into ax
diff --git a/core/parseconfig.inc b/core/parseconfig.inc
index 2ef9c3a2..dfd380f7 100644
--- a/core/parseconfig.inc
+++ b/core/parseconfig.inc
@@ -328,7 +328,7 @@ pc_label:	call commit_vk			; Commit any current vkernel
 ; "say" command
 ;
 pc_say:		call pc_getline			; "say" command
-		call writestr
+		call writestr_early
 		jmp crlf			; tailcall
 
 ;
@@ -410,7 +410,7 @@ commit_vk:
 		ret
 .overflow:
 		mov si,vk_overflow_msg
-		call writestr
+		call writestr_early
 		ret
 
 		section .data
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 2c81ec54..3efd3c67 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -301,10 +301,10 @@ _start1:
 ; Tell the user we got this far
 ;
 		mov si,syslinux_banner
-		call writestr
+		call writestr_early
 
 		mov si,copyright_str
-		call writestr
+		call writestr_early
 
 ;
 ; Assume API version 2.1, in case we find the !PXE structure without
@@ -352,7 +352,7 @@ _start1:
 		jnc have_pxenv
 
 no_pxe:		mov si,err_nopxe
-		call writestr
+		call writestr_early
 		jmp kaboom
 
 have_pxenv:
@@ -360,10 +360,10 @@ have_pxenv:
 		mov [StrucPtr+2],es
 
 		mov si,found_pxenv
-		call writestr
+		call writestr_early
 
 		mov si,apiver_str
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+6]
 		mov [APIVer],ax
 		call writehex4
@@ -388,28 +388,28 @@ have_pxenv:
 
 old_api:	; Need to use a PXENV+ structure
 		mov si,using_pxenv_msg
-		call writestr
+		call writestr_early
 
 		mov eax,[es:bx+0Ah]		; PXE RM API
 		mov [PXEEntry],eax
 
 		mov si,undi_data_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+20h]
 		call writehex4
 		call crlf
 		mov si,undi_data_len_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+22h]
 		call writehex4
 		call crlf
 		mov si,undi_code_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+24h]
 		call writehex4
 		call crlf
 		mov si,undi_code_len_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+26h]
 		call writehex4
 		call crlf
@@ -431,7 +431,7 @@ old_api:	; Need to use a PXENV+ structure
 		mov [RealBaseMem],ax
 
 		mov si,pxenventry_msg
-		call writestr
+		call writestr_early
 		mov ax,[PXEEntry+2]
 		call writehex4
 		mov al,':'
@@ -449,22 +449,22 @@ have_pxe:
 		mov [PXEEntry],eax
 
 		mov si,undi_data_msg
-		call writestr
+		call writestr_early
 		mov eax,[es:bx+2Ah]
 		call writehex8
 		call crlf
 		mov si,undi_data_len_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+2Eh]
 		call writehex4
 		call crlf
 		mov si,undi_code_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+32h]
 		call writehex8
 		call crlf
 		mov si,undi_code_len_msg
-		call writestr
+		call writestr_early
 		mov ax,[es:bx+36h]
 		call writehex4
 		call crlf
@@ -485,7 +485,7 @@ have_pxe:
 		mov [RealBaseMem],ax
 
 		mov si,pxeentry_msg
-		call writestr
+		call writestr_early
 		mov ax,[PXEEntry+2]
 		call writehex4
 		mov al,':'
@@ -601,16 +601,16 @@ make_bootif_string:
 		xchg ah,al
 
 		mov si,myipaddr_msg
-		call writestr
+		call writestr_early
 		call writehex8
 		mov al,' '
 		call writechr
 		pop si				; DotQuadBuf
-		call writestr
+		call writestr_early
 		call crlf
 
 		mov si,IPOption
-		call writestr
+		call writestr_early
 		call crlf
 
 ;
@@ -637,7 +637,7 @@ udp_init:
 		cmp word [pxe_udp_open_pkt.status], byte 0
 		je .success
 .failed:	mov si,err_udpinit
-		call writestr
+		call writestr_early
 		jmp kaboom
 .success:
 
@@ -699,9 +699,9 @@ prefix:		test byte [DHCPMagic], 04h	; Did we get a path prefix option
 		cld
 .got_prefix:
 		mov si,tftpprefix_msg
-		call writestr
+		call writestr_early
 		mov si,PathPrefix
-		call writestr
+		call writestr_early
 		call crlf
 
 ;
@@ -779,16 +779,16 @@ config_scan:
 		jnz .success
 
 		mov si,err_noconfig
-		call writestr
+		call writestr_early
 		jmp kaboom
 
 .try:
 		pusha
 		mov si,trying_msg
-		call writestr
+		call writestr_early
 		mov di,ConfigName
 		mov si,di
-		call writestr
+		call writestr_early
 		call crlf
 		mov si,di
 		mov di,KernelName	;  Borrow this buffer for mangled name
@@ -848,7 +848,7 @@ local_boot:
 		mov [LocalBootType],ax
 		call vgaclearmode
 		mov si,localboot_msg
-		call writestr
+		call writestr_early
 		; Restore the environment we were called with
 		lss sp,[InitStack]
 		pop gs
@@ -869,7 +869,7 @@ local_boot:
 kaboom:
 		RESET_STACK_AND_SEGS AX
 .patch:		mov si,bailmsg
-		call writestr		; Returns with AL = 0
+		call writestr_early		; Returns with AL = 0
 .drain:		call pollchar
 		jz .drained
 		call getchar
@@ -916,7 +916,7 @@ memory_scan_for_pxe_struct:
 		mov ax,cs
 		mov ds,ax
 		mov si,trymempxe_msg
-		call writestr
+		call writestr_early
 		mov ax,[BIOS_fbm]	; Starting segment
 		shl ax,(10-4)		; Kilobytes -> paragraphs
 ;		mov ax,01000h		; Start to look here
@@ -927,7 +927,7 @@ memory_scan_for_pxe_struct:
 		jae .not_found
 		call writehex4
 		mov si,fourbs_msg
-		call writestr
+		call writestr_early
 		mov es,ax
 		mov edx,[es:0]
 		cmp edx,'!PXE'
@@ -954,7 +954,7 @@ memory_scan_for_pxe_struct:
 		clc
 		ret
 .not_found:	mov si,notfound_msg
-		call writestr
+		call writestr_early
 		popa
 		pop ds
 		stc
@@ -973,7 +973,7 @@ memory_scan_for_pxe_struct:
 memory_scan_for_pxenv_struct:
 		pusha
 		mov si,trymempxenv_msg
-		call writestr
+		call writestr_early
 ;		mov ax,[BIOS_fbm]	; Starting segment
 ;		shl ax,(10-4)		; Kilobytes -> paragraphs
 		mov ax,01000h		; Start to look here
@@ -1007,7 +1007,7 @@ memory_scan_for_pxenv_struct:
 		clc
 		ret
 .not_found:	mov si,notfound_msg
-		call writestr
+		call writestr_early
 		popad
 		stc
 		ret
@@ -1327,7 +1327,7 @@ searchdir:
 
 		; Write an error message and explode
 		mov si,err_damage
-		call writestr
+		call writestr_early
 		jmp kaboom
 
 .bailnow:	mov word [bp-2],1	; Immediate error - no retry
@@ -1543,7 +1543,7 @@ is_gpxe:
 		jz .done
 .nogood:
 		mov si,gpxe_warning_msg
-		call writestr
+		call writestr_early
 .done:
 		mov [HasGPXE],bh
 		popad
@@ -2125,7 +2125,7 @@ unload_pxe:
 
 .cant_free:
 		mov si,cant_free_msg
-		call writestr
+		call writestr_early
 		push ax
 		xchg bx,ax
 		call writehex4
@@ -2255,7 +2255,7 @@ xchexbytes:
 pxe_get_cached_info:
 		pushad
 		mov si,get_packet_msg
-		call writestr
+		call writestr_early
 		mov al,dl
 		call writehex2
 		call crlf
@@ -2285,7 +2285,7 @@ pxe_get_cached_info:
 
 .err:
 		mov si,err_pxefailed
-		call writestr
+		call writestr_early
 		call writehex4
 		call crlf
 		jmp kaboom
@@ -2677,7 +2677,7 @@ check_for_arp:
 %include "getc.inc"		; getc et al
 %include "conio.inc"		; Console I/O
 %include "writestr.inc"		; String output
-writestr	equ cwritestr
+writestr_early	equ writestr
 %include "writehex.inc"		; Hexadecimal output
 %include "configinit.inc"	; Initialize configuration
 %include "parseconfig.inc"	; High-level config file handling
diff --git a/core/regdump.inc b/core/regdump.inc
index 59a48c09..bdb5172d 100644
--- a/core/regdump.inc
+++ b/core/regdump.inc
@@ -43,7 +43,7 @@ dumpregs:
 	mov si,[di]
 	inc di
 	inc di
-	call cwritestr
+	call writestr
 	mov eax,[bp]
 	add bp,4
 	call writehex8
@@ -54,7 +54,7 @@ dumpregs:
 	mov si,[di]
 	inc di
 	inc di
-	call cwritestr
+	call writestr
 	mov eax,[bp]
 	inc bp
 	inc bp
diff --git a/core/runkernel.inc b/core/runkernel.inc
index 7ddc7632..bbd9c7af 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -47,9 +47,9 @@
 is_linux_kernel:
 		push si				; <A> file pointer
 		mov si,loading_msg
-                call cwritestr
+                call writestr
                 mov si,KernelCName		; Print kernel name part of
-                call cwritestr                  ; "Loading" message
+                call writestr                  ; "Loading" message
 
 
 ;
@@ -270,7 +270,7 @@ high_load_done:
                 mov es,ax
 
                 mov si,dot_msg
-                call cwritestr
+                call writestr
 ;
 ; Some older kernels (1.2 era) would have more than 4 setup sectors, but
 ; would not rely on the boot protocol to manage that.  These kernels fail
@@ -303,7 +303,7 @@ load_initrd:
                 call abort_check		; Last chance!!
 
 		mov si,ready_msg
-		call cwritestr
+		call writestr
 
 		UNLOAD_PREP			; Module-specific hook
 
@@ -574,11 +574,11 @@ loadinitrd:
 
 		push si
 		mov si,crlfloading_msg		; Write "Loading "
-		call cwritestr
+		call writestr
                 mov si,InitRDCName		; Write ramdisk name
-                call cwritestr
+                call writestr
                 mov si,dotdot_msg		; Write dots
-                call cwritestr
+                call writestr
 		pop si
 
 		mov dx,3
@@ -592,9 +592,9 @@ loadinitrd:
 
 .notthere:
                 mov si,err_noinitrd
-                call cwritestr
+                call writestr
                 mov si,InitRDCName
-                call cwritestr
+                call writestr
                 mov si,crlf_msg
                 jmp abort_load
 
diff --git a/core/ui.inc b/core/ui.inc
index 3fc3e639..f593ce10 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -58,7 +58,7 @@ enter_command:
 		jne auto_boot			; always run default cmd
 
 		mov si,boot_prompt
-		call cwritestr
+		call writestr
 
 		mov byte [FuncFlag],0		; <Ctrl-F> not pressed
 		mov di,command_line
@@ -126,7 +126,7 @@ backspace:	cmp di,command_line		; Make sure there is anything
 		je get_char			; to erase
 		dec di				; Unstore one character
 		mov si,wipe_char		; and erase it from the screen
-		call cwritestr
+		call writestr
 get_char_2:
 		jmp short get_char
 
@@ -195,13 +195,13 @@ show_help:	; AX = func key # (0 = F1, 9 = F10, 11 = F12)
 print_version:
 		push di				; Command line write pointer
 		mov si,syslinux_banner
-		call cwritestr
+		call writestr
 %ifdef HAVE_BIOSNAME
 		mov si,[BIOSName]
-		call cwritestr
+		call writestr
 %endif
 		mov si,copyright_str
-		call cwritestr
+		call writestr
 
 		; ... fall through ...
 
@@ -211,12 +211,12 @@ print_version:
 		; of DI (the command line write pointer) is on the stack.
 fk_wrcmd:
 		mov si,boot_prompt
-		call cwritestr
+		call writestr
 		pop di				; Command line write pointer
 		push di
 		mov byte [di],0			; Null-terminate command line
 		mov si,command_line
-		call cwritestr			; Write command line so far
+		call writestr			; Write command line so far
 fk_nofile:	pop di
 		jmp get_char
 
@@ -233,7 +233,7 @@ show_network_info:
 		lodsw
 		push si
 		mov si,ax
-		call cwritestr
+		call writestr
 		call crlf
 		pop si
 		loop .loop
@@ -421,9 +421,9 @@ bad_kernel:
 		push di
                 call unmangle_name              ; Get human form
 		mov si,err_notfound		; Complain about missing kernel
-		call cwritestr
+		call writestr
 		pop si				; KernelCName
-                call cwritestr
+                call writestr
                 mov si,crlf_msg
                 jmp abort_load                  ; Ask user for clue
 
@@ -610,7 +610,7 @@ is_config_file:
 ; This is an image type we can't deal with
 is_bad_image:
 		mov si,err_badimage
-		call cwritestr
+		call writestr
 		jmp enter_command
 
 %if IS_SYSLINUX || IS_MDSLINUX
diff --git a/core/writestr.inc b/core/writestr.inc
index 04ad67a6..65e37c96 100644
--- a/core/writestr.inc
+++ b/core/writestr.inc
@@ -29,12 +29,12 @@ crlf:		push ax
 		ret
 
 ;
-; cwritestr: write a null-terminated string to the console, saving
+; writestr: write a null-terminated string to the console, saving
 ;            registers on entry.
 ;
-; Note: writestr and cwritestr are distinct in SYSLINUX (only)
+; Note: writestr_early and writestr are distinct in SYSLINUX (only)
 ;
-cwritestr:
+writestr:
 		pushfd
                 pushad
 .top:		lodsb