summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Piastucki <leech.miranda@gmail.com>2015-11-03 18:29:19 +0000
committerPiotr Piastucki <leech.miranda@gmail.com>2015-11-03 18:29:19 +0000
commit13b9e58ec236060385c3701ffe9a314992a073ec (patch)
treee400d251dc152c9b54f7cf7e6e261316f90c8ef5
parent61b460616392f97cd3df0df85c6070c418829669 (diff)
MSN: Forgot to return value in function returning bool
git-svn-id: http://svn.miranda-ng.org/main/trunk@15675 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/MSN/src/msn_auth.cpp6
-rw-r--r--protocols/MSN/src/msn_threads.cpp1
2 files changed, 5 insertions, 2 deletions
diff --git a/protocols/MSN/src/msn_auth.cpp b/protocols/MSN/src/msn_auth.cpp
index a74fd9e928..0f8ba306e9 100644
--- a/protocols/MSN/src/msn_auth.cpp
+++ b/protocols/MSN/src/msn_auth.cpp
@@ -156,7 +156,8 @@ static const char authPacket[] =
GenericToken::GenericToken(const char *pszTokenName):
m_pszTokenName(pszTokenName),
m_pszToken(NULL),
- m_tExpires(0)
+ m_tExpires(0),
+ m_proto(NULL)
{
}
@@ -259,6 +260,7 @@ bool SkypeToken::Refresh(bool bForce)
NETLIBHTTPREQUEST *nlhrReply;
NETLIBHTTPHEADER headers[1];
char szPOST[2048], szToken[1024];
+ bool bRet = false;
if (!bForce && !Expired()) return false;
@@ -315,10 +317,12 @@ bool SkypeToken::Refresh(bool bForce)
tExpires = atoi(pExpireTime+12);
} else tExpires=86400;
SetToken(szToken, time(NULL)+tExpires);
+ bRet=true;
}
}
CallService(MS_NETLIB_FREEHTTPREQUESTSTRUCT, 0, (LPARAM)nlhrReply);
} else m_proto->hHttpsConnection = NULL;
+ return bRet;
}
const char *SkypeToken::XSkypetoken()
diff --git a/protocols/MSN/src/msn_threads.cpp b/protocols/MSN/src/msn_threads.cpp
index 0240aa3ccd..8e92e2e72e 100644
--- a/protocols/MSN/src/msn_threads.cpp
+++ b/protocols/MSN/src/msn_threads.cpp
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
void __cdecl CMsnProto::msn_keepAliveThread(void*)
{
bool keepFlag = true;
- time_t t;
hKeepAliveThreadEvt = CreateEvent(NULL, FALSE, FALSE, NULL);