Fix clang issues. (nw)

This commit is contained in:
couriersud 2015-08-10 23:25:28 +02:00
parent 2692d4e903
commit f3d337b25c
2 changed files with 5 additions and 5 deletions

View File

@ -336,11 +336,11 @@ void pstring_t<F>::resetmem()
// pstring ...
// ----------------------------------------------------------------------------------------
int pstring::scanf(const type_t &format, ...) const
int pstring::scanf(const mem_t *format, ...) const
{
va_list ap;
va_start(ap, format);
int ret = vsscanf(cstr(), format.cstr(), ap);
int ret = vsscanf(cstr(), format, ap);
va_end(ap);
return ret;
}
@ -522,8 +522,8 @@ pformat::pformat(const pstring &fmt)
pformat::pformat(const char *fmt)
: m_arg(0)
{
strncpy(m_str, fmt, sizeof(m_str));
m_str[sizeof(m_str)] = 0;
strncpy(m_str, fmt, sizeof(m_str) - 1);
m_str[sizeof(m_str) - 1] = 0;
}
pformat &pformat::update(const char *f, const char *l, ...)

View File

@ -308,7 +308,7 @@ public:
pstring(const type_t &string) : type_t(string) { }
const type_t vprintf(va_list args) const;
int scanf(const type_t &format, ...) const;
int scanf(const mem_t *format, ...) const;
static const type_t sprintf(const char *format, ...) ATTR_PRINTF(1,2);