QuasarApp/qca
4
0
Fork 0
mirror of https://github.com/QuasarApp/qca.git synced 2025-05-12 02:39:34 +00:00
Code Issues Projects Releases Wiki Activity

Make retval of size()/count() match format string

Browse Source 
Starting with Qt 6 qsizetype is returned (equals size_t).
This commit is contained in:
Tobias Junghans 2021-05-10 09:15:28 +02:00 committed by Albert Astals Cid
parent 35366fea78
commit e6a15466ae
6 changed files with 18 additions and 15 deletions
examples
saslclient
saslclient.cpp
saslserver
saslserver.cpp
plugins
qca-pkcs11
qca-pkcs11.cpp
qca-softstore
qca-softstore.cpp
tools
mozcerts
main.cpp
qcatool
main.cpp

2
examples/saslclient/saslclient.cpp

@ -223,7 +223,7 @@ private Q_SLOTS:
if (mode == 2) // app mode
{
QByteArray a = sock->readAll();
printf("Read %d bytes\n", a.size());
printf("Read %d bytes\n", int(a.size()));
// there is a possible flaw in the qca 2.0 api, in
// that if sasl data is received from the peer

2
examples/saslserver/saslserver.cpp

@ -302,7 +302,7 @@ private Q_SLOTS:
void sasl_readyRead()
{
QByteArray a = sasl->read();
printf("%d: Warning, client sent %d bytes unexpectedly.\n", id, a.size());
printf("%d: Warning, client sent %d bytes unexpectedly.\n", id, int(a.size()));
}
void sasl_readyReadOutgoing()

19
plugins/qca-pkcs11/qca-pkcs11.cpp

@ -638,8 +638,9 @@ public:
_clearSign();
QCA_logTextMessage(QString::asprintf("pkcs11RSAContext::endSign - return result.size ()=%d", result.size()),
Logger::Debug);
QCA_logTextMessage(
QString::asprintf("pkcs11RSAContext::endSign - return result.size ()=%d", int(result.size())),
Logger::Debug);
return result;
}
@ -1317,8 +1318,9 @@ QList<int> pkcs11KeyStoreListContext::keyStores()
pkcs11h_token_freeTokenIdList(tokens);
}
QCA_logTextMessage(QString::asprintf("pkcs11KeyStoreListContext::keyStores - return out.size()=%d", out.size()),
Logger::Debug);
QCA_logTextMessage(
QString::asprintf("pkcs11KeyStoreListContext::keyStores - return out.size()=%d", int(out.size())),
Logger::Debug);
return out;
}
@ -1420,8 +1422,9 @@ QList<KeyStoreEntryContext *> pkcs11KeyStoreListContext::entryList(int id)
pkcs11h_certificate_freeCertificateIdList(certs);
}
QCA_logTextMessage(QString::asprintf("pkcs11KeyStoreListContext::entryList - return out.size()=%d", out.size()),
Logger::Debug);
QCA_logTextMessage(
QString::asprintf("pkcs11KeyStoreListContext::entryList - return out.size()=%d", int(out.size())),
Logger::Debug);
return out;
}
@ -1601,7 +1604,7 @@ pkcs11KeyStoreListContext::_keyStoreEntryByCertificateId(const pkcs11h_certifica
"certificate_id=%p, has_private=%d, chain.size()=%d",
(void *)certificate_id,
has_private ? 1 : 0,
chain.size()),
int(chain.size())),
Logger::Debug);
if (certificate_id == nullptr) {
@ -1804,7 +1807,7 @@ void pkcs11KeyStoreListContext::_deserializeCertificate(const QString &
QString::asprintf(
"pkcs11KeyStoreListContext::_deserializeCertificate - return *p_certificate_id=%p, chain.size()=%d",
(void *)*p_certificate_id,
chain.size()),
int(chain.size())),
Logger::Debug);
}

6
plugins/qca-softstore/qca-softstore.cpp

@ -742,7 +742,7 @@ public:
list += _last_id;
QCA_logTextMessage(
QString::asprintf("softstoreKeyStoreListContext::keyStores - return out.size()=%d", list.size()),
QString::asprintf("softstoreKeyStoreListContext::keyStores - return out.size()=%d", int(list.size())),
Logger::Debug);
return list;
@ -760,7 +760,7 @@ public:
}
QCA_logTextMessage(
QString::asprintf("softstoreKeyStoreListContext::entryList - return out.size()=%d", list.size()),
QString::asprintf("softstoreKeyStoreListContext::entryList - return out.size()=%d", int(list.size())),
Logger::Debug);
return list;
@ -957,7 +957,7 @@ private:
QString::asprintf(
"softstoreKeyStoreListContext::_deserializeSoftStoreEntry - return ret=%d chain.size()=%d",
ret ? 1 : 0,
entry.chain.size()),
int(entry.chain.size())),
Logger::Debug);
return ret;

2
tools/mozcerts/main.cpp

@ -89,7 +89,7 @@ int main(int argc, char **argv)
}
}
printf(">> [%s], %d bytes\n", qPrintable(name), buf.size());
printf(">> [%s], %d bytes\n", qPrintable(name), int(buf.size()));
QTextStream ts(&outfile);
ts << "-----BEGIN CERTIFICATE-----" << '\n';

2
tools/qcatool/main.cpp

@ -3579,7 +3579,7 @@ int main(int argc, char **argv)
if (key.isNull())
return 1;
printf("Keybundle contains %d certificates. Displaying primary:\n", key.certificateChain().count());
printf("Keybundle contains %d certificates. Displaying primary:\n", int(key.certificateChain().count()));
print_cert(key.certificateChain().primary(), ordered);
} else if (args[1] == QLatin1String("pgp")) {
if (args.count() < 3) {