Changeset 5377:72f1d48ff502 in roaraudio for libroar/vio.c

Timestamp:

12/23/11 22:09:58 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Removed legacy functions (Closes: #130):

• roar_vio_init_calls(),
• roar_vio_set_inst(),
• roar_vio_set_fh() and roar_vio_get_fh(),
• roar_simple_new_stream_obj().

File:

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

libroar/vio.c

@@ -45 +45 @@
 #endif
 
-int roar_vio_init_calls (struct roar_vio_calls * calls) {
- roar_debug_warn_obsolete("roar_vio_init_calls", "roar_vio_clear_calls", NULL);
-
-#ifdef _CAN_OPERATE
- if ( calls == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- memset((void*)calls, 0, sizeof(struct roar_vio_calls));
-
- calls->read     = roar_vio_basic_read;
- calls->write    = roar_vio_basic_write;
- calls->lseek    = roar_vio_basic_lseek;
- calls->sync     = roar_vio_basic_sync;
- calls->ctl      = roar_vio_basic_ctl;
- calls->close    = roar_vio_basic_close;
-
- return 0;
-#else
- return -1;
-#endif
-}
-
 int roar_vio_clear_calls (struct roar_vio_calls * calls) {
  if ( calls == NULL ) {
@@ -80 +56 @@
 }
 
-int roar_vio_set_inst (struct roar_vio_calls * vio, void * inst) {
- if ( vio == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
- vio->inst = inst;
-
- return 0;
-}
-
-int roar_vio_set_fh   (struct roar_vio_calls * vio, int fh) {
- return roar_vio_set_inst(vio, (void*)(ROAR_INSTINT)(fh + 1));
-}
-
-int roar_vio_get_fh   (struct roar_vio_calls * vio) {
+static int roar_vio_get_fh   (struct roar_vio_calls * vio) {
  if ( vio == NULL ) {
   roar_err_set(ROAR_ERROR_FAULT);
@@ -287 +248 @@
 
 // converters:
-int     roar_vio_open_file     (struct roar_vio_calls * calls, const char * filename, int flags, mode_t mode) {
- struct roar_vio_defaults def;
-
- roar_debug_warn_obsolete("roar_vio_open_file", "roar_vio_open_dstr", NULL);
-
- if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_FILE, flags, mode) == -1 )
-  return -1;
-
- def.d.file = filename;
-
- return roar_vio_open_default(calls, &def, NULL);
-}
-
 int     roar_vio_open_fh       (struct roar_vio_calls * calls, int fh) {
  if ( calls == NULL ) {
@@ -306 +254 @@
  }
 
- roar_libroar_nowarn();
- if ( roar_vio_init_calls(calls) == -1 ) {
-  roar_libroar_warn();
-  return -1;
- }
- roar_libroar_warn();
-
- return roar_vio_set_fh(calls, fh);
+ memset((void*)calls, 0, sizeof(struct roar_vio_calls));
+
+ calls->read     = roar_vio_basic_read;
+ calls->write    = roar_vio_basic_write;
+ calls->lseek    = roar_vio_basic_lseek;
+ calls->sync     = roar_vio_basic_sync;
+ calls->ctl      = roar_vio_basic_ctl;
+ calls->close    = roar_vio_basic_close;
+
+ calls->inst     = (void*)(ROAR_INSTINT)(fh + 1);
+
+ return 0;
 }