Changeset 6029:c25f9d9f78a6 in roaraudio for libroar/vio_winsock.c

Timestamp:

07/15/14 11:07:45 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some smaller improvements in error handling

File:

• libroar/vio_winsock.c (modified) (4 diffs)

libroar/vio_winsock.c

@@ -48 +48 @@
 
 ssize_t roar_vio_winsock_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
- return recv(_get_fh(vio), buf, count, 0);
+ ssize_t ret;
+
+ roar_err_clear_all();
+ ret = recv(_get_fh(vio), buf, count, 0);
+ roar_err_update();
+
+ return ret;
 }
 
 ssize_t roar_vio_winsock_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
- return send(_get_fh(vio), buf, count, 0);
+ ssize_t ret;
+
+ roar_err_clear_all();
+ ret = send(_get_fh(vio), buf, count, 0);
+ roar_err_update();
+
+ return ret;
 }
 
@@ -70 +82 @@
  switch (cmd) {
   case ROAR_VIO_CTL_GET_NAME:
-    if ( data == NULL )
+    if ( data == NULL ) {
+     roar_err_set(ROAR_ERROR_FAULT);
      return -1;
+    }
 
     *(char**)data = "winsock";
@@ -88 +102 @@
    break;
   case ROAR_VIO_CTL_ACCEPT:
+    roar_err_clear_all();
     tmp = accept(_get_fh(vio), NULL, 0);
+    roar_err_update();
     if ( tmp == -1 )
      return -1;
@@ -113 +129 @@
     }
 
-    if ( tmp != 0 ) /* we currently only support R and W shutdowns */
+    if ( tmp != 0 ) { /* we currently only support R and W shutdowns */
+     roar_err_set(ROAR_ERROR_NOSYS);
      return -1;
+    }
 
     if ( s_r && s_w ) {