Changeset 6029:c25f9d9f78a6 in roaraudio for libroar/caps.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/caps.c (modified) (9 diffs)

libroar/caps.c

@@ -48 +48 @@
  size_t needlen = 4;
 
- if ( mes == NULL || caps == NULL )
-  return -1;
+ if ( mes == NULL || caps == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  needlen += caps->len;
 
  if ( needlen > sizeof(mes->data) ) {
-  if ( data == NULL )
+  if ( data == NULL ) {
+   roar_err_set(ROAR_ERROR_FAULT);
    return -1;
+  }
 
   if ( (*data = roar_mm_malloc(needlen)) == NULL )
@@ -82 +86 @@
  char * datap;
 
- if ( mes == NULL || caps == NULL )
-  return -1;
+ if ( mes == NULL || caps == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( data != NULL ) {
@@ -92 +98 @@
 
  // versin check.
- if ( datap[0] != 0 || mes->datalen < 4 )
-  return -1;
+ if ( datap[0] != 0 ) {
+  roar_err_set(ROAR_ERROR_NSVERSION);
+  return -1;
+ }
+
+ if ( mes->datalen < 4 ) {
+  roar_err_set(ROAR_ERROR_PROTO);
+  return -1;
+ }
 
  memset(caps, 0, sizeof(struct roar_caps));
@@ -132 +145 @@
   flags |= ROAR_CF_REQUEST;
 
- if ( (flags & ROAR_CF_REQUEST) && out == NULL )
-  return -1;
+ if ( (flags & ROAR_CF_REQUEST) && out == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
 
  if ( in != NULL )
@@ -179 +194 @@
  if ( mes.cmd != ROAR_CMD_OK ) {
   if ( data != NULL )
-   roar_mm_free(data);
+   roar_mm_free_noerror(data);
   return -1;
  }
@@ -185 +200 @@
  if ( roar_caps_from_msg(&caps, &mes, data) == -1 ) {
   if ( data != NULL )
-   roar_mm_free(data);
+   roar_mm_free_noerror(data);
   return -1;
  }
@@ -193 +208 @@
   if ( data != NULL )
    roar_mm_free(data);
+  roar_err_set(ROAR_ERROR_PROTO);
   return -1;
  }
@@ -200 +216 @@
   if ( *out == NULL ) {
    if ( data != NULL )
-    roar_mm_free(data);
+    roar_mm_free_noerror(data);
    return -1;
   }
@@ -237 +253 @@
 
  if ( ret->stds == NULL ) {
-  roar_mm_free(ret);
+  roar_mm_free_noerror(ret);
   return NULL;
  }