some bugs fixed, test written, version() added

src/private/pack_p.cpp

@@ -18,6 +18,8 @@ quint8 *MsgPackPrivate::pack(const QVariant &v, quint8 *p, bool wr)
         p = pack_string(v.toString(), p, wr);
     else if (t == QMetaType::QVariantList)
         p = pack_list(v.toList(), p, wr);
+    else if (t == QMetaType::QStringList)
+        p = pack_stringlist(v.toStringList(), p, wr);
     else if (t == QMetaType::LongLong)
         p = pack_longlong(v.toLongLong(), p, wr);
     else if (t == QMetaType::ULongLong)
@@ -120,9 +122,8 @@ quint8 *MsgPackPrivate::pack_bool(const QVariant &v, quint8 *p, bool wr)
     return p + 1;
 }
 
-quint8 *MsgPackPrivate::pack_list(const QVariantList &list, quint8 *p, bool wr)
+quint8 *MsgPackPrivate::pack_listlen(quint32 len, quint8 *p, bool wr)
 {
-    int len = list.length();
     if (len <= 15) {
         if (wr) *p = 0x90 | len;
         p++;
@@ -137,11 +138,27 @@ quint8 *MsgPackPrivate::pack_list(const QVariantList &list, quint8 *p, bool wr)
         if (wr) _msgpack_store32(p, len);
         p += 4;
     }
+    return p;
+}
+
+quint8 *MsgPackPrivate::pack_list(const QVariantList &list, quint8 *p, bool wr)
+{
+    int len = list.length();
+    p = pack_listlen(len, p, wr);
     foreach (QVariant item, list)
         p = pack(item, p, wr);
     return p;
 }
 
+quint8 *MsgPackPrivate::pack_stringlist(const QStringList &list, quint8 *p, bool wr)
+{
+    int len = list.length();
+    p = pack_listlen(len, p, wr);
+    foreach (QString item, list)
+        p = pack_string(item, p, wr);
+    return p;
+}
+
 quint8 *MsgPackPrivate::pack_string(const QString &str, quint8 *p, bool wr)
 {
     int len = str.length();
@@ -306,3 +323,4 @@ quint8 *MsgPackPrivate::pack_user(const QVariant &v, quint8 *p, bool wr)
         memcpy(p, data.data(), len);
     return p += len;
 }
+

src/private/pack_p.h

@@ -22,15 +22,16 @@ quint8 * pack_longlong(qint64 i, quint8 *p, bool wr);
 quint8 * pack_ulonglong(quint64 i, quint8 *p, bool wr);
 
 quint8 * pack_bool(const QVariant &v, quint8 *p, bool wr);
+
+quint8 * pack_listlen(quint32 len, quint8 *p, bool wr);
 quint8 * pack_list(const QVariantList &list, quint8 *p, bool wr);
+quint8 * pack_stringlist(const QStringList &list, quint8 *p, bool wr);
+
 quint8 * pack_string(const QString &str, quint8 *p, bool wr);
 quint8 * pack_double(double i, quint8 *p, bool wr);
 quint8 * pack_array(const QByteArray &arr, quint8 *p, bool wr);
 quint8 * pack_map(const QVariantMap &map, quint8 *p, bool wr);
 quint8 * pack_user(const QVariant &v, quint8 *p, bool wr);
-
-
-
 }
 
 #endif // PACK_P_H

src/private/unpack_p.cpp

@@ -352,24 +352,28 @@ quint8 * MsgPackPrivate::unpack_fixext16(QVariant &v, quint8 *p)
 
 quint8 * MsgPackPrivate::unpack_ext8(QVariant &v, quint8 *p)
 {
-    qint8 type = *(++p);
-    quint32 len = *(p++);
+    p++;
+    quint32 len = *(p);
+    p += 1;
+    qint8 type = *(p);
     return unpack_ext(v, p + 1, type, len);
 }
 
 quint8 * MsgPackPrivate::unpack_ext16(QVariant &v, quint8 *p)
 {
-    qint8 type = *(++p);
+    p++;
     quint32 len = _msgpack_load16(quint32, p);
     p += 2;
+    qint8 type = *(p);
     return unpack_ext(v, p + 1, type, len);
 }
 
 quint8 * MsgPackPrivate::unpack_ext32(QVariant &v, quint8 *p)
 {
-    qint8 type = *(++p);
+    p++;
     quint32 len = _msgpack_load32(quint32, p);
     p += 4;
+    qint8 type = *(p);
     return unpack_ext(v, p + 1, type, len);
 }