whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiling with QHOSTINFO_DEBUG enabled 

Since we require getaddrinfo and freeaddrinfo, those symbols are
not resolved dynamically, and will never be null, which causes compile
errors.

Correctly appending a string literal shuts up compiler warnings.

Change-Id: I0096dca6a77ad86e0c89890444b8d7bbb38a40f2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Volker Hilsheimer 2019-04-23 16:13:12 +02:00
parent 7d646508c8
commit c17d6d4e46
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/kernel/qhostinfo_win.cpp
View File

@ -79,9 +79,8 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
QHostInfo results;
#if defined(QHOSTINFO_DEBUG)
qDebug("QHostInfoAgent::fromName(): looking up \"%s\" (IPv6 support is %s)",
hostName.toLatin1().constData(),
(getaddrinfo && freeaddrinfo) ? "enabled" : "disabled");
qDebug("QHostInfoAgent::fromName(%s) looking up...",
hostName.toLatin1().constData());
#endif
QHostAddress address;
@ -129,6 +128,12 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
if (err == 0) {
QList<QHostAddress> addresses;
for (addrinfo *p = res; p != 0; p = p->ai_next) {
#ifdef QHOSTINFO_DEBUG
qDebug() << "getaddrinfo node: flags:" << p->ai_flags << "family:" << p->ai_family
<< "ai_socktype:" << p->ai_socktype << "ai_protocol:" << p->ai_protocol
<< "ai_addrlen:" << p->ai_addrlen;
#endif
switch (p->ai_family) {
case AF_INET: {
QHostAddress addr;
@ -163,7 +168,7 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
QString tmp;
QList<QHostAddress> addresses = results.addresses();
for (int i = 0; i < addresses.count(); ++i) {
if (i != 0) tmp += ", ";
if (i != 0) tmp += QLatin1String(", ");
tmp += addresses.at(i).toString();
}
qDebug("QHostInfoAgent::run(): found %i entries: {%s}",