Changeset 1099:8cc65a7ec79b in roaraudio for libroar/basic.c

Timestamp:

12/28/08 22:27:48 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added ROAR_NETWORK_READ() and ROAR_NETWORK_WRITE() to support reading and writeing on sockets on win32

File:

• libroar/basic.c (modified) (5 diffs)

libroar/basic.c

@@ -235 +235 @@
  *(uint16_t*)(buf+8) = ROAR_HOST2NET16(mes->datalen);
 
- if ( write(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
+ if ( ROAR_NETWORK_WRITE(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
   roar_errno = ROAR_ERROR_PIPE;
   return -1;
@@ -241 +241 @@
 
  if ( mes->datalen != 0 ) {
-  if ( write(con->fh, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {
+  if ( ROAR_NETWORK_WRITE(con->fh, data == NULL ? mes->data : data, mes->datalen) != mes->datalen ) {
    roar_errno = ROAR_ERROR_PIPE;
    return -1;
@@ -263 +263 @@
   *data = NULL;
 
- if ( read(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
+ if ( ROAR_NETWORK_READ(con->fh, buf, _ROAR_MESS_BUF_LEN) != _ROAR_MESS_BUF_LEN ) {
   roar_errno = ROAR_ERROR_PROTO;
   return -1;
@@ -291 +291 @@
 
  if ( mes->datalen <= LIBROAR_BUFFER_MSGDATA ) {
-  if ( read(con->fh, mes->data, mes->datalen) == mes->datalen ) {
+  if ( ROAR_NETWORK_READ(con->fh, mes->data, mes->datalen) == mes->datalen ) {
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");
@@ -316 +316 @@
   }
 
-  if ( read(con->fh, *data, mes->datalen) == mes->datalen ) {
+  if ( ROAR_NETWORK_READ(con->fh, *data, mes->datalen) == mes->datalen ) {
    ROAR_DBG("roar_recv_message(*): Got data!");
    ROAR_DBG("roar_recv_message(*) = 0");