Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-02 03:06:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use safer rstime_t instead of time_t

Browse source 
Avoid problems to serialization on different platforms, without breaking
nested STL containers serialization.

The conversion have been made with sed, and checked with grep, plus
kdiff3 visual ispection, plus rutime tests, so it should be fine.
This commit is contained in:
Gioacchino Mazzurco 2018-10-07 01:34:05 +02:00
parent 41aa675a9b
commit 329050a9c2
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
223 changed files with 930 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

6
libretroshare/src/upnp/UPnPBase.cpp
View file

@ -788,7 +788,7 @@ const std::string CUPnPService::GetStateVariable(
#ifdef UPNP_DEBUG
std::cerr << "CUPnPService::GetStateVariable() pausing in case of an UPnP event incomming.";
#endif
time_t begin_time = time(NULL);
rstime_t begin_time = time(NULL);
while (true) {
if (time(NULL) - begin_time > 7) {
break;
@ -1071,7 +1071,7 @@ bool CUPnPControlPoint::AddPortMappings(
// Check the number of port mappings before
//have a little break in case we just modified the variable, so we have to wait for an event
// std::cerr << "GetStateVariable pausing in case of an UPnP event incomming.";
// time_t begin_time = time(NULL);
// rstime_t begin_time = time(NULL);
// while (true) {
// if (time(NULL) - begin_time > 7) {
// break;
@ -1101,7 +1101,7 @@ bool CUPnPControlPoint::AddPortMappings(
#ifdef UPNP_DEBUG
std::cerr << "CUPnPControlPoint::AddPortMappings() GetStateVariable pausing in case of an UPnP event incomming.";
#endif
time_t begin_time = time(NULL);
rstime_t begin_time = time(NULL);
while (true) {
if (time(NULL) - begin_time > 4) {
break;