Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-19 11:28:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into jsonapi

Browse source
This commit is contained in:
Gioacchino Mazzurco 2018-08-22 16:59:42 +02:00
commit 396fe49312
No known key found for this signature in database
GPG key ID: A1FBCA3872E87051
84 changed files with 3163 additions and 1501 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/util/extaddrfinder.cc
View file

@ -196,7 +196,6 @@ void* doExtAddrSearch(void *p)
af->mFoundTS = time(NULL) ;
af->mSearching = false ;
}
pthread_exit(NULL);
return NULL ;
}
@ -213,7 +212,6 @@ void* doExtAddrSearch(void *p)
af->mFoundTS = time(NULL) ;
af->mSearching = false ;
}
pthread_exit(NULL);
return NULL ;
}
@ -224,7 +222,6 @@ void* doExtAddrSearch(void *p)
af->mSearching = false ;
}
pthread_exit(NULL);
return NULL ;
}

6
libretroshare/src/util/rsdiscspace.cc
View file

@ -25,7 +25,7 @@
#include "rsserver/p3face.h"
#include "retroshare/rsfiles.h"
#include "retroshare/rsiface.h"
#include "rsserver/rsaccounts.h"
#include "retroshare/rsinit.h"
#include "rsdiscspace.h"
#include <util/rsthreads.h>
@ -166,13 +166,13 @@ bool RsDiscSpace::checkForDiscSpace(RsDiscSpace::DiscLocation loc)
#endif
break ;
case RS_CONFIG_DIRECTORY: rs = crossSystemDiskStats(rsAccounts->PathAccountDirectory().c_str(),free_blocks,block_size) ;
case RS_CONFIG_DIRECTORY: rs = crossSystemDiskStats(RsAccounts::AccountDirectory().c_str(),free_blocks,block_size) ;
#ifdef DEBUG_RSDISCSPACE
std::cerr << " path = " << RsInit::RsConfigDirectory() << std::endl ;
#endif
break ;
case RS_PGP_DIRECTORY: rs = crossSystemDiskStats(rsAccounts->PathPGPDirectory().c_str(),free_blocks,block_size) ;
case RS_PGP_DIRECTORY: rs = crossSystemDiskStats(RsAccounts::PGPDirectory().c_str(),free_blocks,block_size) ;
#ifdef DEBUG_RSDISCSPACE
std::cerr << " path = " << RsInit::RsPGPDirectory() << std::endl ;
#endif

2
libretroshare/src/util/rsexpr.cc
View file

@ -128,7 +128,7 @@ static bool StrContains( const std::string & str1, const std::string & str2,
}
std::string StringExpression::toStdString(const std::string& varstr) const
std::string StringExpression::toStdStringWithParam(const std::string& varstr) const
{
std::string strlist ;
for (auto iter = terms.begin(); iter != terms.end(); ++iter )