Changeset 902 for trunk/src/corelib/io/qprocess_os2.cpp

Timestamp:

Jul 20, 2011, 11:48:57 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

QProcess: Make qt_prettyDebug() global instead of cloning it.

This also fixes the bug in the cloned copy that would always print the whole buffer regardless of the maximum size limitation passed in.

File:

• trunk/src/corelib/io/qprocess_os2.cpp (modified) (1 diff)

trunk/src/corelib/io/qprocess_os2.cpp

@@ -57 +57 @@
 #include <qthread.h>
 
-/*
-    Returns a human readable representation of the first \a len
-    characters in \a data.
-*/
 QT_BEGIN_NAMESPACE
-static QByteArray qt_prettyDebug(const char *data, int len, int maxSize)
-{
-    if (!data) return "(null)";
-    QByteArray out;
-    for (int i = 0; i < len; ++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:
-            QString tmp;
-            tmp.sprintf("\\%o", c);
-            out += tmp.toLatin1();
-        }
-    }
-
-    if (len < maxSize)
-        out += "...";
-
-    return out;
-}
+
+// defined in qprocess.cpp
+extern QByteArray qt_prettyDebug(const char *data, int len, int maxSize);
 
 // redirect qDebug output to a file in the root directory of the current drive