git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
lib
/
vsprintf.c
diff --git
a/lib/vsprintf.c
b/lib/vsprintf.c
index
797428a
..
bed7229
100644
(file)
--- a/
lib/vsprintf.c
+++ b/
lib/vsprintf.c
@@
-489,7
+489,7
@@
int vsnprintf(char *buf, size_t size, const char *fmt, va_list args)
if (str < end)
*str = '\0';
else
-
*end
= '\0';
+
end[-1]
= '\0';
}
/* the trailing null byte doesn't count towards the total */
return str-buf;