Changeset 4876:06a2f29d0450 in roaraudio for libroar/vio_dstr.c

Timestamp:

04/26/11 12:06:37 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some updates to handle error values better with DSTR

File:

• libroar/vio_dstr.c (modified) (5 diffs)

libroar/vio_dstr.c

@@ -329 +329 @@
    break;
   case ROAR_VIO_DEF_TYPE_FILE:
-    if ( roar_vio_open_file(calls, def->d.file, def->o_flags, def->o_mode) == -1 )
+    roar_libroar_nowarn();
+    if ( roar_vio_open_file(calls, def->d.file, def->o_flags, def->o_mode) == -1 ) {
+     roar_libroar_warn();
+     ROAR_DBG("roar_vio_open_default(*): Can not open file: %i", roar_error);
      return -1;
+    }
+    roar_libroar_warn();
    break;
   case ROAR_VIO_DEF_TYPE_SOCKET:
@@ -356 +361 @@
 }
 
-#define _ret(x) roar_mm_free(dstr); return (x)
+#define _ret(x) do { int _err = roar_error; roar_mm_free(dstr); roar_error = _err; roar_err_to_errno(); return (x); } while (0)
 
 int     roar_vio_open_dstr_vio(struct roar_vio_calls * calls,
@@ -548 +553 @@
    case ROAR_VIO_DSTR_OBJT_NULL:
    case ROAR_VIO_DSTR_OBJT_ZERO:
+   case ROAR_VIO_DSTR_OBJT_FULL:
    case ROAR_VIO_DSTR_OBJT_NRANDOM:
    case ROAR_VIO_DSTR_OBJT_TANTALOS:
@@ -745 +751 @@
 }
 
-#define _ret(x) roar_vio_close(calls); ROAR_DBG("roar_vio_dstr_build_chain(*) = %i", (x)); return (x)
+#define _ret(x) do { int _err = roar_error; roar_vio_close(calls); roar_error = _err; roar_err_to_errno(); ROAR_DBG("roar_vio_dstr_build_chain(*) = %i", (x)); return (x); } while(0)
 
 int     roar_vio_dstr_build_chain(struct roar_vio_dstr_chain * chain, struct roar_vio_calls * calls,
@@ -871 +877 @@
     case ROAR_VIO_DSTR_OBJT_NULL:
     case ROAR_VIO_DSTR_OBJT_ZERO:
+    case ROAR_VIO_DSTR_OBJT_FULL:
     case ROAR_VIO_DSTR_OBJT_NRANDOM:
       if ( roar_vio_open_misc_by_name(tc, roar_vio_dstr_get_name(c->type)) == -1 ) {