Changeset 1330:ba9e40c040ed in roaraudio

Timestamp:

03/23/09 03:19:23 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

added roar_vio_open_default()

Files:

• include/libroar/vio_dstr.h (modified) (1 diff)
• libroar/vio_dstr.c (modified) (2 diffs)

include/libroar/vio_dstr.h

@@ -145 +145 @@
 int     roar_vio_dstr_init_defaults (struct roar_vio_defaults * def, int type, int o_flags, mode_t o_mode);
 
+int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def);
+
 int     roar_vio_open_dstr    (struct roar_vio_calls * calls, char * dstr, struct roar_vio_defaults * def, int dnum);
 int     roar_vio_open_dstr_vio(struct roar_vio_calls * calls, char * dstr, struct roar_vio_defaults * def, int dnum, struct roar_vio_calls * vio);

libroar/vio_dstr.c

@@ -166 +166 @@
 }
 
+int     roar_vio_open_default (struct roar_vio_calls * calls, struct roar_vio_defaults * def) {
+ if ( calls == NULL || def == NULL )
+  return -1;
+
+ switch (def->type) {
+  case ROAR_VIO_DEF_TYPE_FILE:
+    if ( roar_vio_open_file(calls, def->d.file, def->o_flags, def->o_mode) == -1 )
+     return -1;
+   break;
+  case ROAR_VIO_DEF_TYPE_SOCKET:
+     return -1;
+   break;
+  case ROAR_VIO_DEF_TYPE_FH:
+    if ( roar_vio_open_fh(calls, def->d.fh) == -1 )
+     return -1;
+   break;
+  case ROAR_VIO_DEF_TYPE_SOCKETFH:
+    if ( roar_vio_open_fh_socket(calls, def->d.fh) == -1 )
+     return -1;
+   break;
+  default:
+    return -1;
+ }
+
+ return 0;
+}
+
 int     roar_vio_open_dstr    (struct roar_vio_calls * calls, char * dstr, struct roar_vio_defaults * def, int dnum) {
  return roar_vio_open_dstr_vio(calls, dstr, def, dnum, NULL);
@@ -449 +476 @@
   }
 
-  switch (def->type) {
-   case ROAR_VIO_DEF_TYPE_FILE:
-     if ( roar_vio_open_file(tc, def->d.file, def->o_flags, def->o_mode) == -1 ) {
-      _ret(-1);
-     }
-    break;
-   case ROAR_VIO_DEF_TYPE_SOCKET:
-     _ret(-1);
-    break;
-   case ROAR_VIO_DEF_TYPE_FH:
-     if ( roar_vio_open_fh(tc, def->d.fh) == -1 ) {
-      _ret(-1);
-     }
-    break;
-   case ROAR_VIO_DEF_TYPE_SOCKETFH:
-     if ( roar_vio_open_fh_socket(tc, def->d.fh) == -1 ) {
-      _ret(-1);
-     }
-    break;
-   default:
-     _ret(-1);
-  }
+  if ( roar_vio_open_default(tc, def) == -1 ) {
+   _ret(-1);
+  }
+
   prev = tc;
  } else {