1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

Fixing a few -Wconversion warnings

This commit is contained in:
Alexander Barkov
2017-09-23 15:48:47 +04:00
parent b652430f00
commit 840f1310cb
11 changed files with 96 additions and 50 deletions

View File

@ -837,7 +837,10 @@ public:
ErrConvString(const String *s)
: ErrConv(), str(s->ptr()), len(s->length()), cs(s->charset()) {}
const char *ptr() const
{ return err_conv(err_buffer, sizeof(err_buffer), str, len, cs); }
{
DBUG_ASSERT(len < UINT_MAX32);
return err_conv(err_buffer, (uint) sizeof(err_buffer), str, (uint) len, cs);
}
};
class ErrConvInteger : public ErrConv