projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update nearly all FSF copyright year lists to include 2010
[pspp]
/
lib
/
vsnprintf.c
diff --git
a/lib/vsnprintf.c
b/lib/vsnprintf.c
index 4f841fc4777e8d6aeb31d9cef566a0fe7c63c1f3..fb0dbfa9a26eb56dae9f512266d499c2ab66608d 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
10
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
@@
-31,11
+31,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
+52,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);
}