X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=mware%2Fsprintf.c;h=64bfd9f0d35cd45975f57a6e49fd1a46d5e087a5;hb=77c1d6ba65a199f60faa0e0a68e63ef0eb87677c;hp=2950727f14ff0e414dd5e1be23105dd6fef64155;hpb=a1d43c00e1504fd5e7e89d84516c0a8c86883ce9;p=bertos.git

diff --git a/mware/sprintf.c b/mware/sprintf.c
old mode 100755
new mode 100644
index 2950727f..64bfd9f0
--- a/mware/sprintf.c
+++ b/mware/sprintf.c
@@ -1,6 +1,31 @@
-/*!
+/**
  * \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 2002, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
  * This file is part of DevLib - See README.devlib for information.
  * -->
@@ -13,6 +38,15 @@
 
 /*#*
  *#* $Log$
+ *#* Revision 1.11  2006/07/19 12:56:28  bernie
+ *#* Convert to new Doxygen style.
+ *#*
+ *#* Revision 1.10  2005/04/11 19:10:28  bernie
+ *#* Include top-level headers from cfg/ subdir.
+ *#*
+ *#* Revision 1.9  2005/02/18 12:48:01  bernie
+ *#* Fix bug with NULL buffers (caught with unit test).
+ *#*
  *#* Revision 1.8  2005/02/18 12:34:29  bernie
  *#* Include <mware/pgm.h> explicitly for non-Harvard archs.
  *#*
@@ -39,7 +73,7 @@
 
 #include <mware/formatwr.h>
 #include <mware/pgm.h>
-#include "compiler.h"
+#include <cfg/compiler.h>
 
 #include <stdio.h>
 
@@ -61,15 +95,20 @@ static void __null_put_char(UNUSED_ARG(char, c), UNUSED_ARG(void *, ptr))
 }
 
 
-int PGM_FUNC(vsprintf)(char * str, const char * PGM_ATTR fmt, va_list ap)
+int PGM_FUNC(vsprintf)(char *str, const char * PGM_ATTR fmt, va_list ap)
 {
 	int result;
 
-	result = PGM_FUNC(_formatted_write)(
-			fmt, (str ? __str_put_char : __null_put_char), &str, ap);
+	if (str)
+	{
+		result = PGM_FUNC(_formatted_write)(fmt, __str_put_char, &str, ap);
+
+		/* Terminate string */
+		*str = '\0';
+	}
+	else
+		result = PGM_FUNC(_formatted_write)(fmt, __null_put_char, 0, ap);
 
-	/* Terminate string */
-	*str = '\0';
 
 	return result;
 }
@@ -87,7 +126,7 @@ int PGM_FUNC(sprintf)(char *str, const char * fmt, ...)
 	return result;
 }
 
-/*!
+/**
  * State information for __sn_put_char()
  */
 struct __sn_state
@@ -96,7 +135,7 @@ struct __sn_state
 	size_t len;
 };
 
-/*!
+/**
  * formatted_write() callback used [v]snprintf().
  */
 static void __sn_put_char(char c, void *ptr)
@@ -118,15 +157,19 @@ int PGM_FUNC(vsnprintf)(char *str, size_t size, const char * PGM_ATTR fmt, va_li
 	/* Make room for traling '\0'. */
 	if (size--)
 	{
-		struct __sn_state state;
-		state.str = str;
-		state.len = size;
-
-		result = PGM_FUNC(_formatted_write)(
-			fmt, (str ? __sn_put_char : __null_put_char), &state, ap);
-
-		/* Terminate string. */
-		*state.str = '\0';
+		if (str)
+		{
+			struct __sn_state state;
+			state.str = str;
+			state.len = size;
+
+			result = PGM_FUNC(_formatted_write)(fmt, __sn_put_char, &state, ap);
+
+			/* Terminate string. */
+			*state.str = '\0';
+		}
+		else
+			result = PGM_FUNC(_formatted_write)(fmt, __null_put_char, 0, ap);
 	}
 
 	return result;