Changeset 5276:0eb24ca6810e in roaraudio for libroar/vio.c

Timestamp:

11/20/11 18:36:49 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

merged VIO's _nonblock() into _ctl() (Closes: #135)

File:

• libroar/vio.c (modified) (8 diffs)

libroar/vio.c

@@ -65 +65 @@
  calls->write    = roar_vio_basic_write;
  calls->lseek    = roar_vio_basic_lseek;
- calls->nonblock = roar_vio_basic_nonblock;
  calls->sync     = roar_vio_basic_sync;
  calls->ctl      = roar_vio_basic_ctl;
@@ -179 +178 @@
 
 int     roar_vio_nonblock(struct roar_vio_calls * vio, int state) {
- int ret;
-
  ROAR_DBG("roar_vio_nonblock(vio=%p, state=%i) = ?", vio, state);
 
@@ -188 +185 @@
  }
 
- if ( vio->nonblock == NULL ) {
-  roar_err_set(ROAR_ERROR_NOSYS);
-  return -1;
- }
-
- roar_err_clear_all();
- ret = vio->nonblock(vio, state);
- roar_err_update();
-
- return ret;
+ return roar_vio_ctl(vio, ROAR_VIO_CTL_NONBLOCK, &state);
 }
 
@@ -346 +334 @@
  calls->read     = roar_vio_winsock_read;
  calls->write    = roar_vio_winsock_write;
- calls->nonblock = roar_vio_winsock_nonblock;
  calls->sync     = roar_vio_winsock_sync;
  calls->ctl      = roar_vio_winsock_ctl;
@@ -414 +401 @@
  return -1;
 #endif
-}
-
-int     roar_vio_basic_nonblock(struct roar_vio_calls * vio, int state) {
- if ( roar_socket_nonblock(roar_vio_get_fh(vio), state) == -1 )
-  return -1;
-
- if ( state == ROAR_SOCKET_NONBLOCK )
-  return 0;
-
- roar_vio_sync(vio);
-
- return 0;
 }
 
@@ -666 +641 @@
    break;
 #endif
+  case ROAR_VIO_CTL_NONBLOCK:
+    if ( roar_socket_nonblock(roar_vio_get_fh(vio), *(int*)data) == -1 )
+     return -1;
+
+    if ( *(int*)data == ROAR_SOCKET_NONBLOCK )
+     return 0;
+
+    roar_vio_sync(vio);
+    return 0;
+   break;
  }
 
@@ -713 +698 @@
  calls->write    = roar_vio_pass_write;
  calls->lseek    = roar_vio_pass_lseek;
- calls->nonblock = roar_vio_pass_nonblock;
  calls->sync     = roar_vio_pass_sync;
  calls->ctl      = roar_vio_pass_ctl;
@@ -733 +717 @@
 off_t   roar_vio_pass_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
  return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence);
-}
-
-int     roar_vio_pass_nonblock(struct roar_vio_calls * vio, int state) {
- return roar_vio_nonblock((struct roar_vio_calls *) vio->inst, state);
 }