nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

make flush_buf have a sane return convention

Browse Source 
svn:r1157
This commit is contained in:
Roger Dingledine 2004-02-28 05:22:07 +00:00
parent 82f224ca6d
commit a24b6e6d4f
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/or/buffers.c
View File

@ -155,9 +155,11 @@ void buf_free(buf_t *buf) {
} }
/* read from socket s, writing onto end of buf. /* read from socket s, writing onto end of buf.
* read at most 'at_most' bytes, and in any case don't read more than will fit based on buflen. * read at most 'at_most' bytes, and in any case don't read more than
* If read() returns 0, set *reached_eof to 1 and return 0. If you want to tear * will fit based on buflen.
* down the connection return -1, else return the number of bytes read. * If read() returns 0, set *reached_eof to 1 and return 0. If you want
* to tear down the connection return -1, else return the number of
* bytes read.
*/ */
int read_to_buf(int s, int at_most, buf_t *buf, int *reached_eof) { int read_to_buf(int s, int at_most, buf_t *buf, int *reached_eof) {
@ -228,7 +230,7 @@ int flush_buf(int s, buf_t *buf, int *buf_flushlen)
/* push from buf onto s /* push from buf onto s
* then memmove to front of buf * then memmove to front of buf
* return -1 or how many bytes remain to be flushed */ * return -1 or how many bytes you just flushed */
int write_result; int write_result;
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
@ -259,8 +261,7 @@ int flush_buf(int s, buf_t *buf, int *buf_flushlen)
log_fn(LOG_DEBUG,"%d: flushed %d bytes, %d ready to flush, %d remain.", log_fn(LOG_DEBUG,"%d: flushed %d bytes, %d ready to flush, %d remain.",
s,write_result,*buf_flushlen,(int)buf->datalen); s,write_result,*buf_flushlen,(int)buf->datalen);
return *buf_flushlen; return write_result;
/* XXX USE_TLS should change to return write_result like any sane function would */
} }
} }