Changeset 5276:0eb24ca6810e in roaraudio for libroar/vio_zlib.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_zlib.c (modified) (3 diffs)

libroar/vio_zlib.c

@@ -435 +435 @@
 }
 
-static int     roar_vio_zlib_nonblock(struct roar_vio_calls * vio, int state) {
- struct roar_vio_gzip * self = vio->inst;
- return roar_vio_nonblock(self->next, state);
-}
-
 static int     roar_vio_zlib_sync    (struct roar_vio_calls * vio) {
  struct roar_vio_gzip * self = vio->inst;
@@ -483 +478 @@
     return -1;
    break;
+  case ROAR_VIO_CTL_NONBLOCK:
+    return roar_vio_ctl(self->next, cmd, data);
+   break;
   default:
     roar_err_set(ROAR_ERROR_BADRQC);
@@ -545 +543 @@
  calls->write      = roar_vio_zlib_write;
  calls->lseek      = roar_vio_zlib_lseek;
- calls->nonblock   = roar_vio_zlib_nonblock;
  calls->sync       = roar_vio_zlib_sync;
  calls->ctl        = roar_vio_zlib_ctl;