Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 02:42:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

return boolean from the QHostAddress::setAddress() overload

Browse source 
it is documented that it does return boolean but the return type of it was
void, who knows why

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2024-03-30 03:43:01 +02:00
parent cad6c377aa
commit 9871d0107c
2 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/network/kernel/qhostaddress.cpp
View file

@ -102,8 +102,6 @@ QHostAddress::QHostAddress(const QByteArray &address)
} }
/*! /*!
\fn QHostAddress::QHostAddress(const sockaddr *sockaddr)
Constructs an IPv4 or IPv6 address using the address specified by Constructs an IPv4 or IPv6 address using the address specified by
the native structure \a sockaddr. the native structure \a sockaddr.
@ -259,34 +257,30 @@ bool QHostAddress::setAddress(const QByteArray &address)
} }
/*! /*!
\fn void QHostAddress::setAddress(const sockaddr *sockaddr)
\overload
Sets the IPv4 or IPv6 address specified by the native structure \a Sets the IPv4 or IPv6 address specified by the native structure \a
sockaddr. Returns true and sets the address if the address was sockaddr. Returns true and sets the address if the address was
successfully parsed; otherwise returns false. successfully parsed; otherwise returns false.
*/ */
void QHostAddress::setAddress(const struct sockaddr *sockaddr) bool QHostAddress::setAddress(const struct sockaddr *sockaddr)
{ {
if (!sockaddr) { if (!sockaddr) {
clear(); clear();
return; return false;
} }
if (sockaddr->sa_family == AF_INET) { if (sockaddr->sa_family == AF_INET) {
QSTACKARRAY(char, ntopbuffer, INET_ADDRSTRLEN + 1); QSTACKARRAY(char, ntopbuffer, INET_ADDRSTRLEN + 1);
if (inet_ntop(AF_INET, &((sockaddr_in *)sockaddr)->sin_addr, ntopbuffer, INET_ADDRSTRLEN) != NULL) { const sockaddr_in* si4 = (const sockaddr_in *)sockaddr;
if (inet_ntop(AF_INET, &si4->sin_addr, ntopbuffer, INET_ADDRSTRLEN) != NULL) {
d->protocol = QAbstractSocket::IPv4Protocol; d->protocol = QAbstractSocket::IPv4Protocol;
d->ipString = ntopbuffer; d->ipString = ntopbuffer;
d->scopeId.clear(); d->scopeId.clear();
} else { return true;
clear();
} }
return;
} }
#ifndef QT_NO_IPV6 #ifndef QT_NO_IPV6
if (sockaddr->sa_family == AF_INET6) { if (sockaddr->sa_family == AF_INET6) {
QSTACKARRAY(char, ntopbuffer, INET6_ADDRSTRLEN + 1); QSTACKARRAY(char, ntopbuffer, INET6_ADDRSTRLEN + 1);
const sockaddr_in6* si6 = (sockaddr_in6 *)sockaddr; const sockaddr_in6* si6 = (const sockaddr_in6 *)sockaddr;
if (inet_ntop(AF_INET6, &(si6->sin6_addr), ntopbuffer, INET6_ADDRSTRLEN) != NULL) { if (inet_ntop(AF_INET6, &(si6->sin6_addr), ntopbuffer, INET6_ADDRSTRLEN) != NULL) {
d->protocol = QAbstractSocket::IPv6Protocol; d->protocol = QAbstractSocket::IPv6Protocol;
d->ipString = ntopbuffer; d->ipString = ntopbuffer;
@ -302,13 +296,12 @@ void QHostAddress::setAddress(const struct sockaddr *sockaddr)
d->scopeId = QByteArray::number(si6->sin6_scope_id); d->scopeId = QByteArray::number(si6->sin6_scope_id);
} }
} }
} else { return true;
clear();
} }
return;
} }
#endif #endif
clear(); clear();
return false;
} }
/*! /*!

2
src/network/kernel/qhostaddress.h
View file

@ -61,7 +61,7 @@ public:
QHostAddress &operator=(const QHostAddress &other); QHostAddress &operator=(const QHostAddress &other);
QHostAddress &operator=(const QByteArray &address); QHostAddress &operator=(const QByteArray &address);
void setAddress(const sockaddr *sockaddr); bool setAddress(const sockaddr *sockaddr);
bool setAddress(const QByteArray &address); bool setAddress(const QByteArray &address);
QAbstractSocket::NetworkLayerProtocol protocol() const; QAbstractSocket::NetworkLayerProtocol protocol() const;