From: cuz <cuz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Sat, 11 Dec 2004 18:33:49 +0000 (+0000)
Subject: Fixed minor issues with the modifiers: Some modifiers where accepted (and
X-Git-Tag: V2.12.0~510
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=569f57bc1bc6ac3dd4d145197bd9351b64afd735;p=cc65

Fixed minor issues with the modifiers: Some modifiers where accepted (and
ignored) that do not exist.
Added C99 modifiers z, j and t.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3326 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/libsrc/common/_printf.s b/libsrc/common/_printf.s
index dffeb64d1..65528d157 100644
--- a/libsrc/common/_printf.s
+++ b/libsrc/common/_printf.s
@@ -460,19 +460,21 @@ ReadPrec:
 
 ReadMod:
 	lda 	(Format),y
-      	cmp 	#'F'
-      	beq 	@L1			; Read and ignore this one
-      	cmp 	#'N'
-      	beq 	@L1			; Read and ignore this one
-      	cmp 	#'h'
-      	beq 	@L1			; Read and ignore this one
-      	cmp 	#'L'
-      	beq 	@L1	 		; Read and ignore this one
-      	cmp 	#'l'
+      	cmp 	#'z'                    ; size_t - same as unsigned
+      	beq 	@L2
+      	cmp 	#'h'                    ; short - same as int
+      	beq 	@L2
+        cmp     #'t'                    ; ptrdiff_t - same as int
+        beq     @L2
+        cmp     #'j'                    ; intmax_t/uintmax_t - same as long
+        beq     @L1
+      	cmp 	#'L'                    ; long double
+      	beq 	@L1
+      	cmp 	#'l'                    ; long int
       	bne 	DoFormat
-      	lda 	#$FF
+@L1:    lda 	#$FF
       	sta 	IsLong
-@L1:  	jsr 	IncFormatPtr
+@L2:  	jsr 	IncFormatPtr
       	jmp	ReadMod
 
 ; Initialize the argument buffer pointers. We use a static buffer (ArgBuf) to