filter-dynamic-mask: Fix nonstandard use of va_start

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2019-12-03 20:38:14 +01:00
parent d9f43ec2e8
commit 59878b62d0
2 changed files with 3 additions and 3 deletions

View File

@ -171,12 +171,12 @@ obs_properties_t*
return props; return props;
} }
std::string filter::dynamic_mask::dynamic_mask_factory::translate_string(std::string format, ...) std::string filter::dynamic_mask::dynamic_mask_factory::translate_string(const char* format, ...)
{ {
va_list vargs; va_list vargs;
va_start(vargs, format); va_start(vargs, format);
std::vector<char> buffer(2048); std::vector<char> buffer(2048);
size_t len = vsnprintf(buffer.data(), buffer.size(), format.c_str(), vargs); size_t len = static_cast<size_t>(vsnprintf(buffer.data(), buffer.size(), format, vargs));
va_end(vargs); va_end(vargs);
return std::string(buffer.data(), buffer.data() + len); return std::string(buffer.data(), buffer.data() + len);
} }

View File

@ -125,7 +125,7 @@ namespace filter {
virtual obs_properties_t* get_properties2(filter::dynamic_mask::dynamic_mask_instance* data) override; virtual obs_properties_t* get_properties2(filter::dynamic_mask::dynamic_mask_instance* data) override;
std::string translate_string(std::string format, ...); std::string translate_string(const char* format, ...);
}; };
} // namespace dynamic_mask } // namespace dynamic_mask
} // namespace filter } // namespace filter