From 5ae3af6cc541a3eac4868618d5b78b1d14504939 Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 4 Apr 2015 15:54:10 +0200 Subject: [PATCH] SupportDefs: Add B_SCN* counterparts for some more types. Namely for [s]size_t, [{phys|generic}_]addr_t and off_t. --- headers/os/support/SupportDefs.h | 34 +++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/headers/os/support/SupportDefs.h b/headers/os/support/SupportDefs.h index 2b5e3c4e99..e1512360cf 100644 --- a/headers/os/support/SupportDefs.h +++ b/headers/os/support/SupportDefs.h @@ -110,43 +110,75 @@ typedef generic_addr_t generic_size_t; #define B_SCNo64 __HAIKU_PRI_PREFIX_64 "o" #define B_SCNx64 __HAIKU_PRI_PREFIX_64 "x" -/* printf() format strings for some standard types */ +/* printf()/scanf() format strings for some standard types */ /* size_t */ #define B_PRIuSIZE __HAIKU_PRI_PREFIX_ADDR "u" #define B_PRIoSIZE __HAIKU_PRI_PREFIX_ADDR "o" #define B_PRIxSIZE __HAIKU_PRI_PREFIX_ADDR "x" #define B_PRIXSIZE __HAIKU_PRI_PREFIX_ADDR "X" + +#define B_SCNuSIZE __HAIKU_PRI_PREFIX_ADDR "u" +#define B_SCNoSIZE __HAIKU_PRI_PREFIX_ADDR "o" +#define B_SCNxSIZE __HAIKU_PRI_PREFIX_ADDR "x" + /* ssize_t */ #define B_PRIdSSIZE __HAIKU_PRI_PREFIX_ADDR "d" #define B_PRIiSSIZE __HAIKU_PRI_PREFIX_ADDR "i" + +#define B_SCNdSSIZE __HAIKU_PRI_PREFIX_ADDR "d" +#define B_SCNiSSIZE __HAIKU_PRI_PREFIX_ADDR "i" + /* addr_t */ #define B_PRIuADDR __HAIKU_PRI_PREFIX_ADDR "u" #define B_PRIoADDR __HAIKU_PRI_PREFIX_ADDR "o" #define B_PRIxADDR __HAIKU_PRI_PREFIX_ADDR "x" #define B_PRIXADDR __HAIKU_PRI_PREFIX_ADDR "X" + +#define B_SCNuADDR __HAIKU_PRI_PREFIX_ADDR "u" +#define B_SCNoADDR __HAIKU_PRI_PREFIX_ADDR "o" +#define B_SCNxADDR __HAIKU_PRI_PREFIX_ADDR "x" + /* phys_addr_t */ #define B_PRIuPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "u" #define B_PRIoPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "o" #define B_PRIxPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "x" #define B_PRIXPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "X" + +#define B_SCNuPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "u" +#define B_SCNoPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "o" +#define B_SCNxPHYSADDR __HAIKU_PRI_PREFIX_PHYS_ADDR "x" + /* generic_addr_t */ #define B_PRIuGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "u" #define B_PRIoGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "o" #define B_PRIxGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "x" #define B_PRIXGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "X" + +#define B_SCNuGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "u" +#define B_SCNoGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "o" +#define B_SCNxGENADDR __HAIKU_PRI_PREFIX_GENERIC_ADDR "x" + /* off_t */ #define B_PRIdOFF B_PRId64 #define B_PRIiOFF B_PRIi64 #define B_PRIxOFF B_PRIx64 + +#define B_SCNdOFF B_SCNd64 +#define B_SCNiOFF B_SCNi64 +#define B_SCNxOFF B_SCNx64 + /* dev_t */ #define B_PRIdDEV B_PRId32 #define B_PRIiDEV B_PRIi32 + /* ino_t */ #define B_PRIdINO B_PRId64 #define B_PRIiINO B_PRIi64 + /* time_t */ #define B_PRIdTIME B_PRId32 #define B_PRIiTIME B_PRIi32 + /* bigtime_t */ #define B_PRIdBIGTIME B_PRId64 #define B_PRIiBIGTIME B_PRIi64