Changeset 2059:916b1d6f2b91 in roaraudio

Timestamp:

07/08/09 01:44:25 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved vio interface to stdio out of the main vio code

Files:

• include/libroar/libroar.h (modified) (1 diff)
• include/libroar/vio.h (modified) (2 diffs)
• include/libroar/vio_stdio.h (added)
• libroar/Makefile (modified) (1 diff)
• libroar/vio.c (modified) (2 diffs)
• libroar/vio_stdio.c (added)

include/libroar/libroar.h

@@ -93 +93 @@
 #include "vio_magic.h"
 #include "vio_bio.h"
+#include "vio_stdio.h"
 #include "vio_stack.h"
 #include "vio_pipe.h"

include/libroar/vio.h

@@ -90 +90 @@
                                                                char * server, int dir, char * name);
 
-int     roar_vio_open_stdio    (struct roar_vio_calls * calls, FILE * dst);
-
-FILE *  roar_vio_to_stdio      (struct roar_vio_calls * calls, int flags);
-#if defined(ROAR_HAVE_FOPENCOOKIE) || defined(ROAR_HAVE_FUNOPEN)
-int roar_vio_to_stdio_close (void *__cookie);
-#endif
-#if defined(ROAR_HAVE_FOPENCOOKIE)
-__ssize_t roar_vio_to_stdio_read (void *__cookie, char *__buf, size_t __nbytes);
-__ssize_t roar_vio_to_stdio_write (void *__cookie, __const char *__buf, size_t __n);
-int roar_vio_to_stdio_lseek (void *__cookie, _IO_off64_t *__pos, int __w);
-#elif defined(ROAR_HAVE_FUNOPEN)
-int roar_vio_to_stdio_read(void *__cookie, char *__buf, int __nbytes);
-int roar_vio_to_stdio_write(void *__cookie, const char *__buf, int __n);
-fpos_t roar_vio_to_stdio_lseek(void *__cookie, fpos_t __pos, int __w);
-#endif
-
-
 // possible VIOs:
 
@@ -150 +133 @@
 off_t   roar_vio_re_lseek(struct roar_vio_calls * vio, off_t offset, int whence);
 
-// stdio
-ssize_t roar_vio_stdio_read    (struct roar_vio_calls * vio, void *buf, size_t count);
-ssize_t roar_vio_stdio_write   (struct roar_vio_calls * vio, void *buf, size_t count);
-off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence);
-int     roar_vio_stdio_sync    (struct roar_vio_calls * vio);
-int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, int cmd, void * data);
-int     roar_vio_stdio_close   (struct roar_vio_calls * vio);
-
 #endif
 

libroar/Makefile

@@ -4 +4 @@
 
 TARGETS=$(SLIB) libroar.a
-VIO=vio.o vio_cmd.o vio_ops.o vio_magic.o vio_pipe.o vio_socket.o vio_bio.o vio_stack.o vio_proto.o vio_dstr.o vio_select.o
+VIO_META=vio.o vio_select.o
+VIO_BRIDGE=vio_bio.o vio_stdio.o
+VIO=$(VIO_META) $(VIO_BRIDGE) vio_cmd.o vio_ops.o vio_magic.o vio_pipe.o vio_socket.o vio_stack.o vio_proto.o vio_dstr.o
 OBJS=libroar.o basic.o stream.o simple.o auth.o socket.o ctl.o buffer.o meta.o file.o acl.o cdrom.o pinentry.o sshaskpass.o $(VIO) stack.o slp.o
 

libroar/vio.c

@@ -280 +280 @@
 }
 
-
-int     roar_vio_open_stdio    (struct roar_vio_calls * calls, FILE * dst) {
-#ifndef ROAR_WITHOUT_VIO_STDIO
- if ( calls == NULL || dst == NULL )
-  return -1;
-
- memset(calls, 0, sizeof(struct roar_vio_calls));
-
- calls->read  = roar_vio_stdio_read;
- calls->write = roar_vio_stdio_write;
- calls->lseek = roar_vio_stdio_lseek;
- calls->sync  = roar_vio_stdio_sync;
- calls->close = roar_vio_stdio_close;
-
- calls->inst  = dst;
-
- return 0;
-#else
- return -1;
-#endif
-}
-
-FILE *  roar_vio_to_stdio      (struct roar_vio_calls * calls, int flags) {
-#ifdef ROAR_HAVE_FOPENCOOKIE
- cookie_io_functions_t foc_funcs;
-#endif
-
- if ( calls == NULL )
-  return NULL;
-
-#if defined(ROAR_HAVE_FOPENCOOKIE)
- memset(&foc_funcs, 0, sizeof(cookie_io_functions_t));
-
- foc_funcs.close = roar_vio_to_stdio_close;
- foc_funcs.read  = roar_vio_to_stdio_read;
- foc_funcs.write = roar_vio_to_stdio_write;
-
- return fopencookie((void*) calls, "rw", foc_funcs);
-#elif defined(ROAR_HAVE_FUNOPEN)
- return funopen((void*) calls, roar_vio_to_stdio_read,  roar_vio_to_stdio_write,
-                               roar_vio_to_stdio_lseek, roar_vio_to_stdio_close);
-#else
- return NULL;
-#endif
-}
-
-#if defined(ROAR_HAVE_FOPENCOOKIE) || defined(ROAR_HAVE_FUNOPEN)
-int roar_vio_to_stdio_close (void *__cookie) {
- return roar_vio_close((struct roar_vio_calls *) __cookie);
-}
-
-#if defined(ROAR_HAVE_FOPENCOOKIE)
-__ssize_t roar_vio_to_stdio_read (void *__cookie, char *__buf, size_t __nbytes) {
-#elif defined(ROAR_HAVE_FUNOPEN)
-int roar_vio_to_stdio_read(void *__cookie, char *__buf, int __nbytes) {
-#endif
- return roar_vio_read((struct roar_vio_calls *) __cookie, __buf, __nbytes);
-}
-
-#if defined(ROAR_HAVE_FOPENCOOKIE)
-__ssize_t roar_vio_to_stdio_write (void *__cookie, __const char *__buf, size_t __n) {
-#elif defined(ROAR_HAVE_FUNOPEN)
-int roar_vio_to_stdio_write(void *__cookie, const char *__buf, int __n) {
-#endif
- return roar_vio_write((struct roar_vio_calls *) __cookie, (char *) __buf, __n);
-}
-
-#if defined(ROAR_HAVE_FOPENCOOKIE)
-int roar_vio_to_stdio_lseek (void *__cookie, _IO_off64_t *__pos, int __w);
-#elif defined(ROAR_HAVE_FUNOPEN)
-fpos_t roar_vio_to_stdio_lseek(void *__cookie, fpos_t __pos, int __w) {
- return roar_vio_lseek((struct roar_vio_calls *) __cookie, __pos, __w);
-}
-#endif
-#endif
-
 // VIOs:
 
@@ -610 +534 @@
 }
 
-// stdio:
-#ifndef ROAR_WITHOUT_VIO_STDIO
-ssize_t roar_vio_stdio_read    (struct roar_vio_calls * vio, void *buf, size_t count) {
- return fread(buf, 1, count, (FILE*)(vio->inst));
-}
-
-ssize_t roar_vio_stdio_write   (struct roar_vio_calls * vio, void *buf, size_t count) {
- return fwrite(buf, 1, count, (FILE*)(vio->inst));
-}
-
-off_t   roar_vio_stdio_lseek   (struct roar_vio_calls * vio, off_t offset, int whence) {
- if ( fseek((FILE*)(vio->inst), offset, whence) == -1 )
-  return -1;
-
- return ftell((FILE*)(vio->inst));
-}
-
-int     roar_vio_stdio_sync    (struct roar_vio_calls * vio) {
- return fflush((FILE*)(vio->inst));
-}
-
-int     roar_vio_stdio_ctl     (struct roar_vio_calls * vio, int cmd, void * data) {
-
- if ( vio == NULL || cmd == -1 )
-  return -1;
-
- switch (cmd) {
-  case ROAR_VIO_CTL_GET_FH:
-  case ROAR_VIO_CTL_GET_READ_FH:
-  case ROAR_VIO_CTL_GET_WRITE_FH:
-   *(int*)data = fileno((FILE*)(vio->inst));
-    return 0;
-   break;
- }
-
- return -1;
-}
-
-int     roar_vio_stdio_close   (struct roar_vio_calls * vio) {
- return fclose((FILE*)(vio->inst));
-}
-#endif
-
 //ll