[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [dferry] serialization: Move printableState() up in the file, make it usable from more paces.
From:       Andreas Hartmetz <ahartmetz () gmail ! com>
Date:       2016-11-28 17:23:10
Message-ID: E1cBPe2-00057I-Fa () code ! kde ! org
[Download RAW message or body]

Git commit d067659b525eac2ee60e4e14c3b7c01d6d54836a by Andreas Hartmetz.
Committed on 28/11/2016 at 17:10.
Pushed by ahartmetz into branch 'master'.

Move printableState() up in the file, make it usable from more paces.

M  +37   -37   serialization/arguments.cpp

https://commits.kde.org/dferry/d067659b525eac2ee60e4e14c3b7c01d6d54836a

diff --git a/serialization/arguments.cpp b/serialization/arguments.cpp
index 3d61e3d..1fc78f5 100644
--- a/serialization/arguments.cpp
+++ b/serialization/arguments.cpp
@@ -51,6 +51,43 @@ static byte alignmentLog2(uint32 alignment)
     return alignLog[alignment];
 }
 
+static cstring printableState(Arguments::IoState state)
+{
+    if (state < Arguments::NotStarted || state > Arguments::UnixFd) {
+        return cstring();
+    }
+    static const char *strings[Arguments::UnixFd + 1] = {
+        "NotStarted",
+        "Finished",
+        "NeedMoreData",
+        "InvalidData",
+        "AnyData",
+        "DictKey",
+        "BeginArray",
+        "EndArray",
+        "BeginDict",
+        "EndDict",
+        "BeginStruct",
+        "EndStruct",
+        "BeginVariant",
+        "EndVariant",
+        "Boolean",
+        "Byte",
+        "Int16",
+        "Uint16",
+        "Int32",
+        "Uint32",
+        "Int64",
+        "Uint64",
+        "Double",
+        "String",
+        "ObjectPath",
+        "Signature",
+        "UnixFd"
+    };
+    return cstring(strings[state]);
+}
+
 // When using this to iterate over the reader, it will make an exact copy using the Writer.
 // You need to do something only in states where something special should happen.
 // To check errors, "simply" (sorry!) check the reader->state() and writer()->state().
@@ -456,43 +493,6 @@ Arguments::Private::~Private()
 #define VALID_IF(cond, errCode) if (likely(cond)) {} else { \
     m_state = InvalidData; d->m_error.setCode(errCode); return; }
 
-static cstring printableState(Arguments::IoState state)
-{
-    if (state < Arguments::NotStarted || state > Arguments::UnixFd) {
-        return cstring();
-    }
-    static const char *strings[Arguments::UnixFd + 1] = {
-        "NotStarted",
-        "Finished",
-        "NeedMoreData",
-        "InvalidData",
-        "AnyData",
-        "DictKey",
-        "BeginArray",
-        "EndArray",
-        "BeginDict",
-        "EndDict",
-        "BeginStruct",
-        "EndStruct",
-        "BeginVariant",
-        "EndVariant",
-        "Boolean",
-        "Byte",
-        "Int16",
-        "Uint16",
-        "Int32",
-        "Uint32",
-        "Int64",
-        "Uint64",
-        "Double",
-        "String",
-        "ObjectPath",
-        "Signature",
-        "UnixFd"
-    };
-    return cstring(strings[state]);
-}
-
 static const int structAlignment = 8;
 
 Arguments::Arguments()

[prev in list] [next in list] [prev in thread] [next in thread]