Changeset 4873:98d17d4deeec in roaraudio for libroar/vs.c

Timestamp:

04/26/11 11:03:46 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

make use of new error stuff

File:

• libroar/vs.c (modified) (2 diffs)

libroar/vs.c

@@ -49 +49 @@
 #define FLAG_DIR_OUT   0x2000
 
-#define _initerr()  do { errno = 0; roar_err_clear(); } while(0)
-#define _seterr(x)  do { if ( error != NULL ) *error = (x); ROAR_DBG("roar_vs_*(*): *error=%s(%i)", roar_vs_strerr((x)), (x)); } while(0)
-#define _seterrre() do { _seterr(roar_errno); } while(0)
-#define _seterrse() do { roar_err_from_errno(); _seterr(roar_errno); } while(0)
+#define _initerr()  roar_err_clear_all()
+#define _seterr(x)  do { if ( error != NULL ) *error = (x); roar_err_set((x)); ROAR_DBG("roar_vs_*(*): *error=%s(%i)", roar_vs_strerr((x)), (x)); } while(0)
+#define _seterrre() do { _seterr(roar_error); } while(0)
+#define _seterrse() do { roar_err_from_errno(); _seterr(roar_error); } while(0)
 #define _ckvss(ret) do { if ( vss == NULL ) { _seterr(ROAR_ERROR_INVAL); return (ret); } } while(0)
 
@@ -405 +405 @@
  if ( ret == -1 ) {
 #ifdef EAGAIN
-  if ( errno == EAGAIN )
-   return 0;
-#endif
-
-#ifdef EWOULDBLOCK
-  if ( errno == EWOULDBLOCK )
+  if ( roar_error == ROAR_ERROR_AGAIN )
    return 0;
 #endif