Changeset 5278:b3e0dd3f3141 in roaraudio for libroar/vio.c

Timestamp:

11/21/11 00:42:20 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

last parts of merging _nonblock into _ctl and fixed sizeof(cmd) of _ctls

File:

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

libroar/vio.c

@@ -56 +56 @@
  memset((void*)calls, 0, sizeof(struct roar_vio_calls));
 
-/*
- calls->read  = (ssize_t (*)(int fd, void *buf, size_t count,      void * inst))read;
- calls->write = (ssize_t (*)(int fd, void *buf, size_t count,      void * inst))write;
- calls->lseek = (off_t   (*)(int fildes, off_t offset, int whence, void * inst))lseek;
-*/
-
  calls->read     = roar_vio_basic_read;
  calls->write    = roar_vio_basic_write;
@@ -155 +149 @@
 }
 
-off_t   roar_vio_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
- off_t ret;
-
- ROAR_DBG("roar_vio_lseek(vio=%p, offset=%u, whence=%i) = ?", vio, (unsigned int)offset, whence);
+roar_off_t   roar_vio_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) {
+ roar_off_t ret;
+
+ ROAR_DBG("roar_vio_lseek(vio=%p, offset=%li, whence=%i) = ?", vio, (long int)offset, whence);
 
  if ( vio == NULL ) {
@@ -210 +204 @@
 }
 
-int     roar_vio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+int     roar_vio_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
  int ret;
 
@@ -394 +388 @@
 }
 
-off_t   roar_vio_basic_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+roar_off_t   roar_vio_basic_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) {
 #ifdef _CAN_OPERATE
  return lseek(roar_vio_get_fh(vio), offset, whence);
@@ -411 +405 @@
 }
 
-int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+int     roar_vio_basic_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
 #ifdef ROAR_HAVE_H_SYS_IOCTL
  struct roar_vio_sysio_ioctl * sysioctl;
@@ -715 +709 @@
 }
 
-off_t   roar_vio_pass_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+roar_off_t   roar_vio_pass_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) {
  return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence);
 }
@@ -723 +717 @@
 }
 
-int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
+int     roar_vio_pass_ctl     (struct roar_vio_calls * vio, roar_vio_ctl_t cmd, void * data) {
  if (vio == NULL) {
   roar_err_set(ROAR_ERROR_FAULT);
@@ -841 +835 @@
 
 // TODO: we should do a some more intelgent thing here.
-off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, off_t offset, int whence) {
+roar_off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, roar_off_t offset, int whence) {
  return roar_vio_lseek((struct roar_vio_calls *) vio->inst, offset, whence);
 }