Tracepointgen: Fix debug print warnings
Pick-to: 6.5 Change-Id: Id6386fd4226024b6bd919b20adc4a5b02c53bc80 Reviewed-by: Hatem ElKharashy <hatem.elkharashy@qt.io> Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
This commit is contained in:
parent
d026fad3d9
commit
3962a27bd8
@ -11,7 +11,7 @@ static void removeOffsetRange(qsizetype begin, qsizetype end, QList<LineNumber>
|
|||||||
{
|
{
|
||||||
qsizetype count = end - begin;
|
qsizetype count = end - begin;
|
||||||
qsizetype i = 0;
|
qsizetype i = 0;
|
||||||
DEBUGPRINTF2(printf("tracepointgen: removeOffsetRange: %d %d\n", begin, end));
|
DEBUGPRINTF2(printf("tracepointgen: removeOffsetRange: %llu %llu\n", begin, end));
|
||||||
while (i < offsets.size()) {
|
while (i < offsets.size()) {
|
||||||
LineNumber &cur = offsets[i];
|
LineNumber &cur = offsets[i];
|
||||||
if (begin > cur.end) {
|
if (begin > cur.end) {
|
||||||
@ -21,7 +21,7 @@ static void removeOffsetRange(qsizetype begin, qsizetype end, QList<LineNumber>
|
|||||||
i++;
|
i++;
|
||||||
} else if (begin < cur.begin && end > cur.end) {
|
} else if (begin < cur.begin && end > cur.end) {
|
||||||
offsets.remove(i);
|
offsets.remove(i);
|
||||||
DEBUGPRINTF2(printf("tracepointgen: removeOffsetRange: %d, %d, %d\n", cur.begin, cur.end, cur.line));
|
DEBUGPRINTF2(printf("tracepointgen: removeOffsetRange: %llu, %llu, %d\n", cur.begin, cur.end, cur.line));
|
||||||
} else if (end >= cur.begin && end <= cur.end) {
|
} else if (end >= cur.begin && end <= cur.end) {
|
||||||
cur.begin = begin;
|
cur.begin = begin;
|
||||||
cur.end -= count;
|
cur.end -= count;
|
||||||
@ -130,9 +130,9 @@ static QString preprocessMetadata(const QString &in)
|
|||||||
|
|
||||||
int Parser::lineNumber(qsizetype offset) const
|
int Parser::lineNumber(qsizetype offset) const
|
||||||
{
|
{
|
||||||
DEBUGPRINTF(printf("tracepointgen: lineNumber: offset %u, line count: %u\n", offset , m_offsets.size()));
|
DEBUGPRINTF(printf("tracepointgen: lineNumber: offset %llu, line count: %llu\n", offset , m_offsets.size()));
|
||||||
for (const auto line : m_offsets) {
|
for (const auto line : m_offsets) {
|
||||||
DEBUGPRINTF(printf("tracepointgen: lineNumber: %d %d %d\n", line.begin, line.end, line.line));
|
DEBUGPRINTF(printf("tracepointgen: lineNumber: %llu %llu %d\n", line.begin, line.end, line.line));
|
||||||
if (offset >= line.begin && offset <= line.end)
|
if (offset >= line.begin && offset <= line.end)
|
||||||
return line.line;
|
return line.line;
|
||||||
}
|
}
|
||||||
@ -147,7 +147,7 @@ void Parser::parseParamReplace(const QString &data, qsizetype offset, const QStr
|
|||||||
QString params = data.mid(beginBrace + 1, endBrace - beginBrace -1);
|
QString params = data.mid(beginBrace + 1, endBrace - beginBrace -1);
|
||||||
int punc = params.indexOf(QLatin1Char(','));
|
int punc = params.indexOf(QLatin1Char(','));
|
||||||
if (punc < 0)
|
if (punc < 0)
|
||||||
panic("Syntax error in Q_TRACE_PARAM_REPLACE at file %s, line %d", qPrintable(name), lineNumber(offset));
|
panic("Syntax error in Q_TRACE_PARAM_REPLACE at file %s, line %llu", qPrintable(name), lineNumber(offset));
|
||||||
rep.in = params.left(punc).simplified();
|
rep.in = params.left(punc).simplified();
|
||||||
rep.out = params.right(params.length() - punc - 1).simplified();
|
rep.out = params.right(params.length() - punc - 1).simplified();
|
||||||
if (rep.in.endsWith(QLatin1Char('*')) || rep.out.endsWith(QLatin1Char(']')))
|
if (rep.in.endsWith(QLatin1Char('*')) || rep.out.endsWith(QLatin1Char(']')))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user