Changeset 5253:a9d4cba9e8dc in roaraudio for libroar/vio.c

Timestamp:

11/13/11 17:01:45 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved situation on opening files with DSTR/old roar_vio_open_file()

File:

• libroar/vio.c (modified) (1 diff)

libroar/vio.c

@@ -306 +306 @@
 // converters:
 int     roar_vio_open_file     (struct roar_vio_calls * calls, const char * filename, int flags, mode_t mode) {
-#ifdef _CAN_OPERATE
- int fh;
+ struct roar_vio_defaults def;
 
  roar_debug_warn_obsolete("roar_vio_open_file", "roar_vio_open_dstr", NULL);
 
- if ( calls == NULL || filename == NULL ) {
-  roar_err_set(ROAR_ERROR_FAULT);
-  return -1;
- }
-
-#ifdef ROAR_TARGET_WIN32
- flags |= O_BINARY;
-#endif
-
- roar_err_clear_all();
- if ( (fh = open(filename, flags, mode)) == -1 ) {
-  ROAR_DBG("roar_vio_open_file(*): errno=%s", strerror(errno));
-  roar_err_update();
-  ROAR_DBG("roar_vio_open_file(*): errno=%s", strerror(errno));
-  return -1;
- }
-
- if ( roar_vio_open_fh(calls, fh) == -1 ) {
-  close(fh);
-  roar_err_update();
-  return -1;
- }
-
- roar_err_update();
- return 0;
-#else
- return -1;
-#endif
+ 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);
 }