Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-19 22:40:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleaned some compiler warnings

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2010-06-09 19:51:46 +00:00
parent ead1228535
commit c3b6da6386
8 changed files with 25 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/services/p3blogs.cc
View file

@ -369,7 +369,7 @@ bool p3Blogs::locked_eventDuplicateMsg(GroupInfo *grp, RsDistribMsg *msg, std::s
}
/* check age */
time_t age = time(NULL) - msg->timestamp;
uint32_t age = time(NULL) - msg->timestamp;
if (age > DOWNLOAD_PERIOD)
{

21
libretroshare/src/services/p3distrib.cc
View file

@ -64,9 +64,6 @@ p3GroupDistrib::p3GroupDistrib(uint16_t subtype,
mMaxCacheSubId(1),
mKeyBackUpDir(keyBackUpDir), BACKUP_KEY_FILE("key.log"), mLastKeyPublishTime(0)
{
/* not much yet */
time_t now = time(NULL);
/* force publication of groups (cleared if local cache file found) */
mGroupsRepublish = true;
@ -90,7 +87,7 @@ int p3GroupDistrib::tick()
{
RsStackMutex stack(distribMtx); /**** STACK LOCKED MUTEX ****/
toPublish = (mPendingPublish.size() > 0) && (now > mPubPeriod + mLastPublishTime);
toPublish = (mPendingPublish.size() > 0) && (now > (time_t) (mPubPeriod + mLastPublishTime));
}
@ -352,7 +349,7 @@ void p3GroupDistrib::loadFileMsgs(std::string filename, uint16_t cacheSubId, std
mMaxCacheSubId = cacheSubId;
}
if ((ts < now) && (ts > mLastPublishTime))
if (((time_t) ts < now) && ((time_t) ts > mLastPublishTime))
{
#ifdef DISTRIB_DEBUG
std::cerr << "p3GroupDistrib::loadFileMsgs() New LastPublishTime";
@ -1528,7 +1525,6 @@ std::string p3GroupDistrib::createGroup(std::wstring name, std::wstring desc, ui
std::cerr << std::endl;
#endif
/* Create a Group */
GroupInfo grpInfo;
std::string grpId;
time_t now = time(NULL);
@ -1664,7 +1660,7 @@ std::string p3GroupDistrib::createGroup(std::wstring name, std::wstring desc, ui
unsigned int siglen = EVP_PKEY_size(key_admin);
unsigned char sigbuf[siglen];
int ans = EVP_SignFinal(mdctx, sigbuf, &siglen, key_admin);
EVP_SignFinal(mdctx, sigbuf, &siglen, key_admin);
/* save signature */
newGrp->adminSignature.signData.setBinData(sigbuf, siglen);
@ -2091,7 +2087,7 @@ std::string p3GroupDistrib::publishMsg(RsDistribMsg *msg, bool personalSign)
unsigned int siglen = EVP_PKEY_size(publishKey);
unsigned char sigbuf[siglen];
int ans = EVP_SignFinal(mdctx, sigbuf, &siglen, publishKey);
EVP_SignFinal(mdctx, sigbuf, &siglen, publishKey);
/* save signature */
signedMsg->publishSignature.signData.setBinData(sigbuf, siglen);
@ -2370,7 +2366,7 @@ bool p3GroupDistrib::locked_editGroup(std::string grpId, GroupInfo& gi){
unsigned int siglen = EVP_PKEY_size(key_admin);
unsigned char sigbuf[siglen];
int ans = EVP_SignFinal(mdctx, sigbuf, &siglen, key_admin);
EVP_SignFinal(mdctx, sigbuf, &siglen, key_admin);
/* save signature */
gi_curr->distribGroup->adminSignature.signData.setBinData(sigbuf, siglen);
@ -3009,11 +3005,10 @@ bool p3GroupDistrib::locked_checkDistribMsg(
/* check timestamp */
time_t now = time(NULL);
time_t min = now - mStorePeriod;
time_t minPub = now - mStorePeriod / 2.0;
time_t max = now + GROUP_MAX_FWD_OFFSET;
uint32_t min = now - mStorePeriod;
uint32_t max = now + GROUP_MAX_FWD_OFFSET;
if ((msg->timestamp < min) || (msg->timestamp > max))
if ((msg->timestamp < min) || (msg->timestamp > max))
{
#ifdef DISTRIB_DEBUG
std::cerr << "p3GroupDistrib::locked_checkDistribMsg() TS out of range";