Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Hopefully fixed compilation with MSC which doesn't know va_copy but which allows using a va_list with a consumer function more than once.

Browse Source
This commit is contained in:
Moritz Bunkus 2005-04-11 10:47:01 +00:00
parent ed3a1f4a53
commit c1d2c53d58
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/common.cpp
View File

@ -1397,11 +1397,15 @@ get_varg_len(const char *fmt,
size = 1024; size = 1024;
dst = (char *)safemalloc(size); dst = (char *)safemalloc(size);
while (1) { while (1) {
#if defined(COMP_MSC)
result = vsnprintf(dst, size - 1, fmt, ap);
#else
va_list ap2; va_list ap2;
va_copy(ap2, ap); va_copy(ap2, ap);
result = vsnprintf(dst, size - 1, fmt, ap2); result = vsnprintf(dst, size - 1, fmt, ap2);
va_end(ap2); va_end(ap2);
#endif // defined(COMP_MSC)
if (result >= 0) { if (result >= 0) {
safefree(dst); safefree(dst);
return result; return result;
@ -1420,14 +1424,20 @@ mxvsprintf(const char *fmt,
string new_fmt, dst; string new_fmt, dst;
char *new_string; char *new_string;
int len; int len;
#if !defined(COMP_MSC)
va_list ap2; va_list ap2;
#endif
fix_format(fmt, new_fmt); fix_format(fmt, new_fmt);
len = get_varg_len(new_fmt.c_str(), ap); len = get_varg_len(new_fmt.c_str(), ap);
new_string = (char *)safemalloc(len + 1); new_string = (char *)safemalloc(len + 1);
#if defined(COMP_MSC)
vsprintf(new_string, new_fmt.c_str(), ap);
#else
va_copy(ap2, ap); va_copy(ap2, ap);
vsprintf(new_string, new_fmt.c_str(), ap2); vsprintf(new_string, new_fmt.c_str(), ap2);
va_end(ap2); va_end(ap2);
#endif // defined(COMP_MSC)
dst = new_string; dst = new_string;
safefree(new_string); safefree(new_string);