X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fformatwr.c;h=62fc342123641c9063d59569a884ae40a2b25aa9;hb=09598a3a18d9a290d68a5bd9e39352b9f3aeab39;hp=8a2e57e1af027e61a51639bd8e1bca650dcbd548;hpb=646a88d7412eec847c282b9b2050b3a37a9af7a5;p=bertos.git

diff --git a/mware/formatwr.c b/mware/formatwr.c
old mode 100755
new mode 100644
index 8a2e57e1..62fc3421
--- a/mware/formatwr.c
+++ b/mware/formatwr.c
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
  * Copyright 2003, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See README.devlib for information.
+ *
  * -->
  *
  * \version $Id$
@@ -53,6 +78,12 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.19  2006/09/20 13:58:17  marco
+ *#* Added z modifier in string format.
+ *#*
+ *#* Revision 1.18  2006/07/19 12:56:27  bernie
+ *#* Convert to new Doxygen style.
+ *#*
  *#* Revision 1.17  2005/11/04 17:43:27  bernie
  *#* Fix for LP64 architectures; Add some more tests.
  *#*
@@ -91,12 +122,12 @@
 #include <appconfig.h> /* CONFIG_ macros */
 
 #ifndef CONFIG_PRINTF_N_FORMATTER
-	/*! Disable the arcane %n formatter. */
+	/** Disable the arcane %n formatter. */
 	#define CONFIG_PRINTF_N_FORMATTER 0
 #endif
 
 #ifndef CONFIG_PRINTF_OCTAL_FORMATTER
-	/*! Disable the %o formatter. */
+	/** Disable the %o formatter. */
 	#define CONFIG_PRINTF_OCTAL_FORMATTER 0
 #endif
 
@@ -320,7 +351,7 @@ CLEAN_UP:
 
 #endif /* CONFIG_PRINTF > PRINTF_NOFLOAT */
 
-/*!
+/**
  * This routine forms the core and entry of the formatter.
  *
  * The conversion performed conforms to the ANSI specification for "printf".
@@ -495,11 +526,12 @@ NEXT_FLAG:
 		flags.l_L_modifier = false;
 		flags.h_modifier = false;
 
-		/* Optional 'l','L' r 'h' modifier? */
+		/* Optional 'l','L','z' or 'h' modifier? */
 		switch (PGM_READ_CHAR(format))
 		{
 			case 'l':
 			case 'L':
+			case 'z':
 				flags.l_L_modifier = true;
 				format++;
 				break;
@@ -817,7 +849,7 @@ FLOATING_CONVERSION:
 #else /* PRINTF_REDUCED starts here */
 
 #if CONFIG_PRINTF > PRINTF_NOMODIFIERS
-	char l_modifier, h_modifier;
+	bool l_modifier, h_modifier;
 	unsigned long u_val, div_val;
 #else
 	unsigned int u_val, div_val;
@@ -843,16 +875,16 @@ FLOATING_CONVERSION:
 		/*=================================*/
 		/* Optional 'l' or 'h' modifiers ? */
 		/*=================================*/
-		l_modifier = h_modifier = 0;
+		l_modifier = h_modifier = false;
 		switch (PGM_READ_CHAR(format))
 		{
 			case 'l':
-				l_modifier = 1;
+				l_modifier = true;
 				format++;
 				break;
 
 			case 'h':
-				h_modifier = 1;
+				h_modifier = true;
 				format++;
 				break;
 		}