/*#*
*#* $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.2 2004/06/03 11:27:09 bernie
*#* Add dual-license information.
- *#*
- *#* Revision 1.1 2004/05/23 15:43:16 bernie
- *#* Import mware modules.
- *#*
- *#* Revision 1.4 2004/04/03 20:42:27 aleph
- *#* Remove duplicated defines
- *#*
- *#* Revision 1.3 2004/03/24 15:48:53 bernie
- *#* Remove Copyright messages from Doxygen output
- *#*
- *#* Revision 1.2 2004/03/19 16:51:30 bernie
- *#* Add PROGMEM kludge.
- *#*
- *#* Revision 1.1 2004/02/23 09:45:09 aleph
- *#* Add missing library functions.
- *#*
- *#* Revision 1.1 2003/11/13 16:56:37 aleph
- *#* Add first implementation of dsp firmware
- *#*
*#*/
#include "compiler.h"
(*((char **)ptr))++;
}
-static void __null_put_char(UNUSED(char, c), UNUSED(void *, ptr))
+static void __null_put_char(UNUSED_ARG(char, c), UNUSED_ARG(void *, ptr))
{
/* nop */
}
{
struct __sn_state *state = (struct __sn_state *)ptr;
- if (state->len > 0)
+ if (state->len)
{
--state->len;
*state->str++ = c;
}
-int PGM_FUNC(vsnprintf)(char * str, size_t size, const char * PGM_ATTR fmt, va_list ap)
+int PGM_FUNC(vsnprintf)(char *str, size_t size, const char * PGM_ATTR fmt, va_list ap)
{
- int result;
- struct __sn_state state = { str, size };
+ int result = 0;
- result = PGM_FUNC(_formatted_write)(
+ /* 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';
+ /* Terminate string. */
+ *state.str = '\0';
+ }
return result;
}