marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Replace NoPointer struct with template parameter deduction 

We're trying to ensure that no caller passes a char* to ssprintf, but a
char array instead. This is way easier done by using template parameter
deduction than a specialized class template.
issue1247
Nicolas Hake 2015-02-12 22:21:53 +01:00
parent 69cdae5ef2
commit 35e7ca509b
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/lib/Standard.h
View File

@ -159,22 +159,14 @@ inline int osprintf(char *str, const char *fmt, ...)
return vsprintf(str, fmt, args);
}
// wrapper to detect "char *"
template <typename T> struct NoPointer { static void noPointer() { } };
template <> struct NoPointer<char *> { };
// secure sprintf
#define sprintf ssprintf
template <typename T>
inline int ssprintf(T &str, const char *fmt, ...) GNUC_FORMAT_ATTRIBUTE_O;
template <typename T>
inline int ssprintf(T &str, const char *fmt, ...)
template <size_t N>
inline int ssprintf(char(&str)[N], const char *fmt, ...) GNUC_FORMAT_ATTRIBUTE_O
{
NoPointer<T>::noPointer();
int n = sizeof(str);
va_list args; va_start(args, fmt);
int m = vsnprintf(str, n, fmt, args);
if (m >= n) { m = n-1; str[m] = 0; }
int m = vsnprintf(str, N, fmt, args);
if (m >= N) { m = N-1; str[m] = 0; }
return m;
}