diff options
author | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-16 14:25:16 +0000 |
---|---|---|
committer | osmiy <osmiy@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2007-04-16 14:25:16 +0000 |
commit | e66ec30996e556383d7a85fb6ab2ae16e7b574f5 (patch) | |
tree | 9793def4f756fcfa160ca6a374882d74e33cc3d5 | |
parent | ecd09023d7a5c4c2c0680b097a10c0f9ce132657 (diff) | |
download | zabbix-e66ec30996e556383d7a85fb6ab2ae16e7b574f5.tar.gz zabbix-e66ec30996e556383d7a85fb6ab2ae16e7b574f5.tar.xz zabbix-e66ec30996e556383d7a85fb6ab2ae16e7b574f5.zip |
win2nix
git-svn-id: svn://svn.zabbix.com/trunk@4027 97f52cf1-0a1b-0410-bd0e-c28be96e8082
-rwxr-xr-x | build/win32/include/config.h | 2 | ||||
-rw-r--r-- | src/libs/zbxcomms/comms.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/build/win32/include/config.h b/build/win32/include/config.h index 03cafbb4..496e48d9 100755 --- a/build/win32/include/config.h +++ b/build/win32/include/config.h @@ -50,4 +50,4 @@ #define HAVE_TIME_H 1 /* Define to 1 if you have the <assert.h> header file. */ -#define HAVE_ASSERT_H 1
\ No newline at end of file +#define HAVE_ASSERT_H 1 diff --git a/src/libs/zbxcomms/comms.c b/src/libs/zbxcomms/comms.c index d4ec3e26..f26751f5 100644 --- a/src/libs/zbxcomms/comms.c +++ b/src/libs/zbxcomms/comms.c @@ -565,13 +565,13 @@ int zbx_tcp_recv(zbx_sock_t *s, char **data) read_bytes = nbytes; expected_len = 16*1024*1024; } -
+ if( ZBX_TCP_ERROR != nbytes ) - {
+ { /* fill static buffer */ while( read_bytes < expected_len && (sizeof(s->buf_stat) - read_bytes - 1) > 0 && ZBX_TCP_ERROR != (nbytes = ZBX_TCP_READ( s->socket, s->buf_stat + read_bytes, sizeof(s->buf_stat) - read_bytes - 1))) - {
+ { read_bytes += nbytes; if( ZBX_TCP_READ_EOF(nbytes, sizeof(s->buf_stat) - read_bytes - 1) ) break; } @@ -585,7 +585,7 @@ int zbx_tcp_recv(zbx_sock_t *s, char **data) memset(s->buf_dyn,0,allocated); memcpy(s->buf_dyn, s->buf_stat, sizeof(s->buf_stat)); -
+ offset = read_bytes; /* fill dynamic buffer */ while( read_bytes < expected_len && ZBX_TCP_ERROR != (nbytes = ZBX_TCP_READ(s->socket, s->buf_stat, sizeof(s->buf_stat)-1)) ) @@ -599,7 +599,7 @@ int zbx_tcp_recv(zbx_sock_t *s, char **data) *data = s->buf_dyn; } - }
+ } if( ZBX_TCP_ERROR == nbytes ) { |