X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=bertos%2Fmware%2Fformatwr.c;h=7293c4dc7a0b4f624314b83a2de072f0f02ee97b;hb=f1597b21dbfbfceb5224956a041d84dc0aaeefb0;hp=7baea75ac0aff86f2b68346997642362e3f40a5b;hpb=47d5e292509c20d22adfc608f412bdbe7209decb;p=bertos.git

diff --git a/bertos/mware/formatwr.c b/bertos/mware/formatwr.c
index 7baea75a..7293c4dc 100644
--- a/bertos/mware/formatwr.c
+++ b/bertos/mware/formatwr.c
@@ -46,7 +46,7 @@
  *  -D CONFIG_PRINTF=PRINTF_FULL         Full ANSI printf formatter, with some C99 extensions
  *  -D CONFIG_PRINTF=PRINTF_NOFLOAT      Exclude support for floats
  *  -D CONFIG_PRINTF=PRINTF_REDUCED      Simplified formatter (see below)
- *  -D CONFIG_PRINTF=PRINTF_NOMODIFIERS  Exclude 'l', 'z' and 'h' modifiers in reduced version
+ *  -D CONFIG_PRINTF=PRINTF_NOMODIFIERS  Exclude "l", "z" and "h" modifiers in reduced version
  *  -D CONFIG_PRINTF=PRINTF_DISABLED     No formatter at all
  * \endcode
  *
@@ -106,16 +106,25 @@
 	/* Maximum precision for floating point values */
 	typedef long double max_float_t;
 
-	/*luca: FIXME: this should be enough to print floating point values, must be investigated
-	 * further.
-	 */
-	#define FRMWRI_BUFSIZE 20
+	#if CONFIG_FRMWRI_BUFSIZE
+		#define FRMWRI_BUFSIZE CONFIG_FRMWRI_BUFSIZE
+	#else
+		/* Conservative estimate. Max float is 3.40282e+038, so %f (but not %e or %g) must have
+		 * space for: sign + all 38 digits + '.' + 6 decimal digits (default)
+		 * Use a high value to avoid unexpected buffer overflows.
+		 */
+		#define FRMWRI_BUFSIZE 134
+	#endif
 #else
-	/*
-	 * Conservative estimate. Should be (probably) 12 (which is the size necessary
-	 * to represent (2^32-1) in octal plus the sign bit.
-	 */
-	#define FRMWRI_BUFSIZE 16
+	#if CONFIG_FRMWRI_BUFSIZE
+		#define FRMWRI_BUFSIZE CONFIG_FRMWRI_BUFSIZE
+	#else
+		/*
+		 * Conservative estimate. Should be (probably) 12 (which is the size necessary
+		 * to represent (2^32-1) in octal plus the sign bit.
+		 */
+		#define FRMWRI_BUFSIZE 16
+	#endif
 #endif
 
 /* Probably useful for fancy microcontrollers such as the PIC, nobody knows. */
@@ -496,14 +505,21 @@ NEXT_FLAG:
 		{
 			case 'l':
 			case 'L':
+		#if SIZEOF_SIZE_T == SIZEOF_LONG
 			case 'z':
 				flags.l_L_modifier = true;
+		#elif SIZEOF_SIZE_T == SIZEOF_INT
+				flags.l_L_modifier = true;
+			case 'z':
+		#endif
 				format++;
 				break;
+
 			case 'h':
 				flags.h_modifier = true;
 				format++;
 				break;
+
 		}
 
 		/*
@@ -844,10 +860,13 @@ FLOATING_CONVERSION:
 		switch (PGM_READ_CHAR(format))
 		{
 			case 'l':
+		#if SIZEOF_SIZE_T == SIZEOF_LONG
 			case 'z':
-				/* for the 'z' modifier, we make this assumption */
-				STATIC_ASSERT(sizeof(size_t) == sizeof(long));
 				l_modifier = true;
+		#elif SIZEOF_SIZE_T == SIZEOF_INT
+				l_modifier = true;
+			case 'z':
+		#endif
 				format++;
 				break;