Skip to content
Snippets Groups Projects
Commit f2818986 authored by deuce's avatar deuce
Browse files

Have do_CryptFlush() return a bool.

Also some whitespace cleanup.
parent 72e73049
No related branches found
No related tags found
No related merge requests found
...@@ -108,7 +108,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_ ...@@ -108,7 +108,7 @@ static int do_cryptAttributeString(const CRYPT_CONTEXT session, CRYPT_ATTRIBUTE_
} \ } \
} while(0) } while(0)
static void do_CryptFlush(js_socket_private_t *p) static bool do_CryptFlush(js_socket_private_t *p)
{ {
int ret; int ret;
char *estr; char *estr;
...@@ -118,10 +118,12 @@ static void do_CryptFlush(js_socket_private_t *p) ...@@ -118,10 +118,12 @@ static void do_CryptFlush(js_socket_private_t *p)
if(ret==CRYPT_OK) { if(ret==CRYPT_OK) {
p->unflushed = 0; p->unflushed = 0;
return true;
} }
else GCES(ret, p, estr, "flushing data");
GCES(ret, p, estr, "flushing data"); return false;
} }
return true;
} }
static void do_js_close(js_socket_private_t *p) static void do_js_close(js_socket_private_t *p)
...@@ -201,7 +203,8 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s ...@@ -201,7 +203,8 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s
do { do {
if((ret=cryptPushData(p->session, msg, len, &copied))==CRYPT_OK) { if((ret=cryptPushData(p->session, msg, len, &copied))==CRYPT_OK) {
p->unflushed += copied; p->unflushed += copied;
if(flush) do_CryptFlush(p); if(flush)
do_CryptFlush(p);
if(p->nonblocking) if(p->nonblocking)
return copied; return copied;
total += copied; total += copied;
...@@ -213,13 +216,15 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s ...@@ -213,13 +216,15 @@ static ptrdiff_t js_socket_sendsocket(js_socket_private_t *p, const void *msg, s
} }
else { else {
GCES(ret, p, estr, "pushing data"); GCES(ret, p, estr, "pushing data");
if(flush) do_CryptFlush(p); if(flush)
do_CryptFlush(p);
return total; return total;
} }
if(!socket_check(p->sock,NULL,NULL,0)) if(!socket_check(p->sock,NULL,NULL,0))
break; break;
} while(len); } while(len);
if(flush) do_CryptFlush(p); if(flush)
do_CryptFlush(p);
return total; return total;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment