/*!
* \file
* <!--
- * Copyright (C) 2002,2004 Develer S.r.l. (http://www.develer.com/)
- * This file is part of DevLib - See devlib/README for information.
+ * Copyright 2002, 2004, 2005 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
* -->
*
* \brief sprintf() implementation based on _formatted_write()
/*#*
*#* $Log$
+ *#* 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.
+ *#*
*#* Revision 1.7 2004/12/31 17:47:45 bernie
*#* Rename UNUSED() to UNUSED_ARG().
*#*
*#* Add dual-license information.
*#*/
+#include <mware/formatwr.h>
+#include <mware/pgm.h>
#include "compiler.h"
-#include "formatwr.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;
}
/* 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;