Nil packer and unittests pack/unpack for nil

This commit is contained in:
Anton Dutov
2015-06-29 01:33:48 +05:00
parent c8b826c6a0
commit deac492817
4 changed files with 29 additions and 1 deletions
+11 -1
View File
@@ -15,7 +15,10 @@ bool MsgPackPrivate::compatibilityMode = false;
quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr)
{
QMetaType::Type t = (QMetaType::Type)v.type();
if (t == QMetaType::Int)
if (v.isNull())
p = pack_nil(p, wr);
else if (t == QMetaType::Int)
p = pack_int(v.toInt(), p, wr);
else if (t == QMetaType::UInt)
p = pack_uint(v.toUInt(), p, wr);
@@ -47,6 +50,13 @@ quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr)
return p;
}
quint8 *MsgPackPrivate::pack_nil(quint8 *p, bool wr)
{
if (wr)
*p = 0xc0;
return p + 1;
}
quint8 *MsgPackPrivate::pack_int(qint32 i, quint8 *p, bool wr)
{
if (i >= -32 && i <= 127) {
+1
View File
@@ -23,6 +23,7 @@ extern bool compatibilityMode;
quint8 * pack(const QVariant &v, quint8 *p, bool wr);
quint8 * pack_nil(quint8 *p, bool wr);
quint8 * pack_int(qint32 i, quint8 *p, bool wr);
quint8 * pack_uint(quint32 i, quint8 *p, bool wr);
quint8 * pack_longlong(qint64 i, quint8 *p, bool wr);