kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Run indent-all script.

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/rdesktop/trunk@1721 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Henrik Andersson 2013-06-20 12:57:00 +00:00
parent e6b10f6bcb
commit adbb6cf0fc
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cssp.c
View File

@ -36,7 +36,7 @@ s_realloc(STREAM s, unsigned int size)
{ {
unsigned char *data; unsigned char *data;
if(s->size >= size) if (s->size >= size)
return; return;
data = s->data; data = s->data;
@ -263,7 +263,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
memset(&message, 0, sizeof(message)); memset(&message, 0, sizeof(message));
// domainName [0] // domainName [0]
s_realloc(&tmp, strlen(domain)*sizeof(uint16)); s_realloc(&tmp, strlen(domain) * sizeof(uint16));
s_reset(&tmp); s_reset(&tmp);
for (i = 0; i < strlen(domain); i++) for (i = 0; i < strlen(domain); i++)
out_uint16_le(&tmp, domain[i]); out_uint16_le(&tmp, domain[i]);
@ -277,7 +277,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
s_free(h1); s_free(h1);
// userName [1] // userName [1]
s_realloc(&tmp, strlen(username)*sizeof(uint16)); s_realloc(&tmp, strlen(username) * sizeof(uint16));
s_reset(&tmp); s_reset(&tmp);
for (i = 0; i < strlen(username); i++) for (i = 0; i < strlen(username); i++)
out_uint16_le(&tmp, username[i]); out_uint16_le(&tmp, username[i]);
@ -291,7 +291,7 @@ cssp_encode_tspasswordcreds(char *username, char *password, char *domain)
s_free(h1); s_free(h1);
// password [2] // password [2]
s_realloc(&tmp, strlen(password)*sizeof(uint16)); s_realloc(&tmp, strlen(password) * sizeof(uint16));
s_reset(&tmp); s_reset(&tmp);
for (i = 0; i < strlen(password); i++) for (i = 0; i < strlen(password); i++)
out_uint16_le(&tmp, password[i]); out_uint16_le(&tmp, password[i]);
@ -915,7 +915,7 @@ cssp_connect(char *server, char *user, char *domain, char *password, STREAM s)
return True; return True;
bail_out: bail_out:
xfree(token.data); xfree(token.data);
return False; return False;
} }

8
rdesktop.c
View File

@ -1113,7 +1113,8 @@ main(int argc, char *argv[])
/* check if auto reconnect cookie has timed out */ /* check if auto reconnect cookie has timed out */
if (time(NULL) - g_reconnect_random_ts > RECONNECT_TIMEOUT) if (time(NULL) - g_reconnect_random_ts > RECONNECT_TIMEOUT)
{ {
fprintf(stderr, "Tried to reconnect for %d minutes, giving up.\n", RECONNECT_TIMEOUT/60); fprintf(stderr, "Tried to reconnect for %d minutes, giving up.\n",
RECONNECT_TIMEOUT / 60);
return EX_PROTOCOL; return EX_PROTOCOL;
} }
@ -1155,8 +1156,9 @@ main(int argc, char *argv[])
/* handle network error and start autoreconnect */ /* handle network error and start autoreconnect */
if (g_network_error) if (g_network_error)
{ {
fprintf(stderr, "Disconnected due to network error, retrying to reconnect for %d minutes.\n", fprintf(stderr,
RECONNECT_TIMEOUT/60); "Disconnected due to network error, retrying to reconnect for %d minutes.\n",
RECONNECT_TIMEOUT / 60);
g_network_error = False; g_network_error = False;
g_reconnect_loop = True; g_reconnect_loop = True;
continue; continue;