summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qdebug.cpp
diff options
context:
space:
mode:
authorAlex Trotsenko <alex1973tr@gmail.com>2021-05-26 18:05:36 +0300
committerAlex Trotsenko <alex1973tr@gmail.com>2021-05-31 21:50:07 +0300
commit86542054d035c43f926eeb96b517108eb825831e (patch)
tree10029d15b5a7ada0f856c8d09c8b048c41520bd0 /src/corelib/io/qdebug.cpp
parent59a0539690f8fb5b97d9d2241167cd5fac236950 (diff)
Consolidate debug string generation
Several QIODevice subclasses use the qt_prettyDebug() function to get a printable representation of the buffer data for debug output. Rather than having this feature statically implemented in each respective file, this patch introduces a generic function in the QtDebugUtils namespace. Accordingly, some inaccuracies in the use-cases have been corrected. Change-Id: I1a8465cab08c8acf5fdcdba5085182511b1cbb7b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
Diffstat (limited to 'src/corelib/io/qdebug.cpp')
-rw-r--r--src/corelib/io/qdebug.cpp48
1 files changed, 48 insertions, 0 deletions
diff --git a/src/corelib/io/qdebug.cpp b/src/corelib/io/qdebug.cpp
index b1ebf097cf..0a7a847ef6 100644
--- a/src/corelib/io/qdebug.cpp
+++ b/src/corelib/io/qdebug.cpp
@@ -46,15 +46,63 @@
#endif
#include "qdebug.h"
+#include "private/qdebug_p.h"
#include "qmetaobject.h"
#include <private/qtextstream_p.h>
#include <private/qtools_p.h>
+#include <ctype.h>
QT_BEGIN_NAMESPACE
using QtMiscUtils::toHexUpper;
+using QtMiscUtils::toHexLower;
using QtMiscUtils::fromHex;
+/*
+ Returns a human readable representation of the first \a maxSize
+ characters in \a data.
+*/
+QByteArray QtDebugUtils::toPrintable(const char *data, int len, int maxSize)
+{
+ if (!data)
+ return "(null)";
+
+ QByteArray out;
+ for (int i = 0; i < qMin(len, maxSize); ++i) {
+ char c = data[i];
+ if (isprint(c)) {
+ out += c;
+ } else {
+ switch (c) {
+ case '\n':
+ out += "\\n";
+ break;
+ case '\r':
+ out += "\\r";
+ break;
+ case '\t':
+ out += "\\t";
+ break;
+ default: {
+ const char buf[] = {
+ '\\',
+ 'x',
+ toHexLower(uchar(c) / 16),
+ toHexLower(uchar(c) % 16),
+ 0
+ };
+ out += buf;
+ }
+ }
+ }
+ }
+
+ if (maxSize < len)
+ out += "...";
+
+ return out;
+}
+
// This file is needed to force compilation of QDebug into the kernel library.
/*!