Changeset 6029:c25f9d9f78a6 in roaraudio for libroar/vio_misc.c

Timestamp:

07/15/14 11:07:45 (10 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

some smaller improvements in error handling

File:

• libroar/vio_misc.c (modified) (7 diffs)

libroar/vio_misc.c

@@ -39 +39 @@
  struct roar_vio_misc * self = vio->inst;
 
- if ( self->read == NULL )
+ if ( self->read == NULL ) {
+  roar_err_set(ROAR_ERROR_NOSYS);
   return -1;
+ }
 
  return self->read(buf, count, vio, self);
@@ -48 +50 @@
  struct roar_vio_misc * self = vio->inst;
 
- if ( self->write == NULL )
+ if ( self->write == NULL ) {
+  roar_err_set(ROAR_ERROR_RO);
   return -1;
+ }
 
  return self->write(buf, count, vio, self);
@@ -74 +78 @@
  switch (cmd) {
   case ROAR_VIO_CTL_GET_NAME:
-    if ( data == NULL )
+    if ( data == NULL ) {
+     roar_err_set(ROAR_ERROR_FAULT);
      return -1;
+    }
 
     *(const char**)data = self->name;
@@ -91 +97 @@
      return 0;
 
+    roar_err_set(ROAR_ERROR_NOSYS);
     return -1;
    break; 
  }
 
+ roar_err_set(ROAR_ERROR_BADRQC);
  return -1;
 }
@@ -104 +112 @@
 
 int     roar_vio_open_misc    (struct roar_vio_calls * calls, const struct roar_vio_misc * callbacks) {
- if ( calls == NULL || callbacks == NULL )
+ if ( calls == NULL || callbacks == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  memset(calls, 0, sizeof(struct roar_vio_calls));
@@ -173 +183 @@
  size_t i;
 
- if ( calls == NULL || name == NULL )
+ if ( calls == NULL || name == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
   return -1;
+ }
 
  for (i = 0; i < (sizeof(libroar_vio_miscs)/sizeof(*libroar_vio_miscs)); i++)
@@ -180 +192 @@
    return roar_vio_open_misc(calls, &(libroar_vio_miscs[i]));
 
+ roar_err_set(ROAR_ERROR_NOENT);
  return -1;
 }