-/*!
+/**
* \file
* <!--
- * Copyright (C) 2002,2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * 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/)
+ *
* -->
*
* \brief sprintf() implementation based on _formatted_write()
* \author Bernardo Innocenti <bernie@develer.com>
*/
-/*#*
- *#* $Log$
- *#* Revision 1.7 2004/12/31 17:47:45 bernie
- *#* Rename UNUSED() to UNUSED_ARG().
- *#*
- *#* Revision 1.6 2004/11/16 21:15:19 bernie
- *#* Fix off-by-one bug in [v]snprintf().
- *#*
- *#* Revision 1.5 2004/10/03 18:54:36 bernie
- *#* sprintf(): Fix a serious bug; snprintf(): New function.
- *#*
- *#* Revision 1.4 2004/08/25 14:12:09 rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.3 2004/06/27 15:20:26 aleph
- *#* Change UNUSED() macro to accept two arguments: type and name;
- *#* Add macro GNUC_PREREQ to detect GCC version during build;
- *#* Some spacing cleanups and typo fix
- *#*
- *#* Revision 1.2 2004/06/03 11:27:09 bernie
- *#* Add dual-license information.
- *#*/
-
-#include "compiler.h"
-#include "formatwr.h"
+#include <mware/formatwr.h>
+#include <mware/pgm.h>
+#include <cfg/compiler.h>
+
#include <stdio.h>
}
-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;
}
return result;
}
-/*!
+/**
* State information for __sn_put_char()
*/
struct __sn_state
size_t len;
};
-/*!
+/**
* formatted_write() callback used [v]snprintf().
*/
static void __sn_put_char(char c, void *ptr)
/* 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;