diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-12-21 19:12:56 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-12-21 19:12:56 +0000 |
| commit | be7a33df9d5106fb91c650d80dd0483a5105ba41 (patch) | |
| tree | 6daf9de5a53bb9b7d234c8838d18414c61128924 /protocols/JabberG/src | |
| parent | 02cb797db83340236b98fbc2b64d1a59808fa6aa (diff) | |
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@11561 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/JabberG/src')
| -rw-r--r-- | protocols/JabberG/src/jabber_secur.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/protocols/JabberG/src/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp index d8112927ae..688ffb1fc5 100644 --- a/protocols/JabberG/src/jabber_secur.cpp +++ b/protocols/JabberG/src/jabber_secur.cpp @@ -106,13 +106,10 @@ char* TNtlmAuth::getInitialRequest() return NULL;
// This generates login method advertisement packet
- char* result;
if (info->conn.password[0] != 0)
- result = Netlib_NtlmCreateResponse2(hProvider, "", info->conn.username, info->conn.password, &complete);
- else
- result = Netlib_NtlmCreateResponse2(hProvider, "", NULL, NULL, &complete);
+ return Netlib_NtlmCreateResponse2(hProvider, "", info->conn.username, info->conn.password, &complete);
- return result;
+ return Netlib_NtlmCreateResponse2(hProvider, "", NULL, NULL, &complete);
}
char* TNtlmAuth::getChallenge(const TCHAR *challenge)
@@ -120,14 +117,11 @@ char* TNtlmAuth::getChallenge(const TCHAR *challenge) if (!hProvider)
return NULL;
- char *text = (!mir_tstrcmp(challenge, _T("="))) ? mir_strdup("") : mir_t2a(challenge), *result;
+ ptrA text((!mir_tstrcmp(challenge, _T("="))) ? mir_strdup("") : mir_t2a(challenge));
if (info->conn.password[0] != 0)
- result = Netlib_NtlmCreateResponse2(hProvider, text, info->conn.username, info->conn.password, &complete);
- else
- result = Netlib_NtlmCreateResponse2(hProvider, text, NULL, NULL, &complete);
-
- mir_free(text);
- return result;
+ return Netlib_NtlmCreateResponse2(hProvider, text, info->conn.username, info->conn.password, &complete);
+
+ return Netlib_NtlmCreateResponse2(hProvider, text, NULL, NULL, &complete);
}
/////////////////////////////////////////////////////////////////////////////////////////
|