Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-01-13 16:39:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #491 from G10h4ck/warnings_cleanup

Browse Source 
fix compiler warnings, fix typos and remove unuseful code
This commit is contained in:
Cyril Soler 2016-09-08 17:08:34 +02:00 committed by GitHub
commit e3d12c4faf
4 changed files with 43 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
libbitdht/src/udp/udplayer.cc
View File

@ -243,74 +243,66 @@ void UdpLayer::run()
/* higher level interface */
void UdpLayer::recv_loop()
{
int maxsize = 16000;
size_t maxsize = 16000;
void *inbuf = malloc(maxsize);
if(inbuf == NULL)
{
std::cerr << "(EE) Error in memory allocation of size " << maxsize << " in " << __PRETTY_FUNCTION__ << std::endl;
return ;
}
int status;
struct timeval timeout;
if(inbuf == NULL)
{
std::cerr << "(EE) Error in memory allocation of size " << maxsize
<< " in " << __PRETTY_FUNCTION__ << std::endl;
return;
}
int status;
struct timeval timeout;
while(1)
{
fd_set rset;
for(;;)
for(;;)
{
/* check if we need to stop */
bool toStop = false;
{
bdStackMutex stack(sockMtx); /********** LOCK MUTEX *********/
bdStackMutex stack(sockMtx); (void) stack;
toStop = stopThread;
}
if (toStop)
{
#ifdef DEBUG_UDP_LAYER
std::cerr << "UdpLayer::recv_loop() stopping thread" << std::endl;
#endif
free(inbuf) ;
free(inbuf);
stop();
return; // Avoid compiler warning about usage of inbuf after free
}
FD_ZERO(&rset);
FD_SET(sockfd, &rset);
timeout.tv_sec = 0;
timeout.tv_usec = 500000; /* 500 ms timeout */
status = select(sockfd+1, &rset, NULL, NULL, &timeout);
if (status > 0)
{
break; /* data available, go read it */
}
else if (status < 0)
{
fd_set rset;
FD_ZERO(&rset);
FD_SET(sockfd, &rset);
timeout.tv_sec = 0;
timeout.tv_usec = 500000; // 500 ms timeout
status = select(sockfd+1, &rset, NULL, NULL, &timeout);
if (status > 0) break; // data available, go read it
#ifdef DEBUG_UDP_LAYER
std::cerr << "UdpLayer::recv_loop() Error: " << bdnet_errno() << std::endl;
else if (status < 0) std::cerr << "UdpLayer::recv_loop() Error: "
<< bdnet_errno() << std::endl;
#endif
}
};
};
int nsize = maxsize;
int nsize = static_cast<int>(maxsize);
struct sockaddr_in from;
if (0 < receiveUdpPacket(inbuf, &nsize, from))
{
#ifdef DEBUG_UDP_LAYER
std::cerr << "UdpLayer::readPkt() from : " << from << std::endl;
std::cerr << printPkt(inbuf, nsize);
std::cerr << "UdpLayer::readPkt() from : " << from << std::endl
<< printPkt(inbuf, nsize);
#endif
// send to reciever.
recv -> recvPkt(inbuf, nsize, from);
recv->recvPkt(inbuf, nsize, from); // pass to reciever.
}
else
{
#ifdef DEBUG_UDP_LAYER
std::cerr << "UdpLayer::readPkt() not ready" << from;
std::cerr << std::endl;
else std::cerr << "UdpLayer::readPkt() not ready" << from << std::endl;
#endif
}
}
}

2
libretroshare/src/libretroshare.pro
View File

@ -276,7 +276,7 @@ mac {
DEFINES *= MINIUPNPC_VERSION=13
CONFIG += upnp_miniupnpc
CONFIG += c+11
CONFIG += c++11
# zeroconf disabled at the end of libretroshare.pro (but need the code)
#CONFIG += zeroconf

33
libretroshare/src/serialiser/rsserial.h
View File

@ -178,32 +178,21 @@ std::ostream &printIndent(std::ostream &out, uint16_t indent);
class RsRawItem: public RsItem
{
public:
RsRawItem(uint32_t t, uint32_t size)
:RsItem(t), len(size)
{
data = rs_malloc(len);
}
public:
RsRawItem(uint32_t t, uint32_t size) : RsItem(t), len(size)
{ data = rs_malloc(len); }
virtual ~RsRawItem() { free(data); }
virtual ~RsRawItem()
{
if (data)
free(data);
data = NULL;
len = 0;
}
uint32_t getRawLength() { return len; }
void * getRawData() { return data; }
uint32_t getRawLength() { return len; }
void *getRawData() { return data; }
virtual void clear() {}
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
virtual void clear() { return; } /* what can it do? */
virtual std::ostream &print(std::ostream &out, uint16_t indent = 0);
private:
void *data;
uint32_t len;
private:
void *data;
uint32_t len;
};
#endif /* RS_BASE_SERIALISER_H */

2
retroshare.pri
View File

@ -84,7 +84,7 @@ macx {
message(***retroshare.pri: No SDK, set it to MacOS 10.10 )
QMAKE_MAC_SDK = macosx10.10
}
CONFIG += c+11
CONFIG += c++11
}
unfinished {