projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log1pf-ieee: Work around test failure on OpenBSD 4.9 and AIX 7.1.
[gnulib.git]
/
lib
/
vsnprintf.c
diff --git
a/lib/vsnprintf.c
b/lib/vsnprintf.c
index
4f841fc
..
2ff7f9c
100644
(file)
--- a/
lib/vsnprintf.c
+++ b/
lib/vsnprintf.c
@@
-1,5
+1,5
@@
/* Formatted output to strings.
/* Formatted output to strings.
- Copyright (C) 2004, 2006-20
07
Free Software Foundation, Inc.
+ Copyright (C) 2004, 2006-20
12
Free Software Foundation, Inc.
Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
This program is free software; you can redistribute it and/or modify
Written by Simon Josefsson and Yoann Vandoorselaere <yoann@prelude-ids.org>.
This program is free software; you can redistribute it and/or modify
@@
-13,8
+13,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License along
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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
# include <config.h>
#ifdef HAVE_CONFIG_H
# include <config.h>
@@
-31,11
+30,6
@@
#include "vasnprintf.h"
#include "vasnprintf.h"
-/* Some systems, like OSF/1 4.0 and Woe32, don't have EOVERFLOW. */
-#ifndef EOVERFLOW
-# define EOVERFLOW E2BIG
-#endif
-
/* Print formatted output to string STR. Similar to vsprintf, but
additional length SIZE limit how much is written into STR. Returns
string length of formatted string (which may be larger than SIZE).
/* Print formatted output to string STR. Similar to vsprintf, but
additional length SIZE limit how much is written into STR. Returns
string length of formatted string (which may be larger than SIZE).
@@
-57,11
+51,11
@@
vsnprintf (char *str, size_t size, const char *format, va_list args)
if (output != str)
{
if (size)
if (output != str)
{
if (size)
- {
- size_t pruned_len = (len < size ? len : size - 1);
- memcpy (str, output, pruned_len);
- str[pruned_len] = '\0';
- }
+
{
+
size_t pruned_len = (len < size ? len : size - 1);
+
memcpy (str, output, pruned_len);
+
str[pruned_len] = '\0';
+
}
free (output);
}
free (output);
}