Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(731)

Unified Diff: runtime/vm/os_win.cc

Issue 10052030: Address review comments. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/os_win.cc
===================================================================
--- runtime/vm/os_win.cc (revision 6436)
+++ runtime/vm/os_win.cc (working copy)
@@ -160,16 +160,27 @@
}
+#ifndef va_copy
Ivan Posva 2012/04/17 18:54:44 The only question I have is whether we should move
siva 2012/04/17 23:55:00 Will move it once we run into that issue again. Fo
+#define va_copy(dst, src) (memmove(&(dst), &(src), sizeof(dst)))
+#endif /* va_copy */
+
+
int OS::VSNPrint(char* str, size_t size, const char* format, va_list args) {
if (str == NULL || size == 0) {
return _vscprintf(format, args);
}
- int written =_vsnprintf(str, size, format, args);
+ va_list args_copy;
+ va_copy(args_copy, args);
+ int written =_vsnprintf(str, size, format, args_copy);
+ va_end(args_copy);
if (written < 0) {
// _vsnprintf returns -1 if the number of characters to be written is
// larger than 'size', so we call _vscprintf which returns the number
// of characters that would have been written.
- written = _vscprintf(format, args);
+ va_list args_retry;
+ va_copy(args_retry, args);
+ written = _vscprintf(format, args_retry);
+ va_end(args_retry);
}
// Make sure to zero-terminate the string if the output was
// truncated or if there was an error.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698