Changeset 4618:950031048258 in roaraudio

Timestamp:

11/22/10 14:54:12 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Corrected error codes in VS API (Closes: #90)

Files:

• ChangeLog (modified) (1 diff)
• libroar/vs.c (modified) (4 diffs)

ChangeLog

@@ -9 +9 @@
         * Updated docs
         * Support dir parameter in OINFO command (Closes: #31)
+        * Corrected error codes in VS API (Closes: #90)
 
 v. 0.4beta1 - Mon Nov 01 2010 16:14 CET

libroar/vs.c

@@ -259 +259 @@
  file = &(vss->file_store);
 
- // TODO: FIXME: correct error handling bellow.
-
- if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, dir, 0644) == -1 )
-  return -11;
+ _initerr();
+
+ if ( roar_vio_dstr_init_defaults(&def, ROAR_VIO_DEF_TYPE_NONE, dir, 0644) == -1 ) {
+  _seterrre();
+  return -1;
+ }
 
  if ( roar_vio_open_dstr(file, filename, &def, 1) == -1 ) {
+  _seterrre();
   return -1;
  }
@@ -280 +283 @@
    if ( codec == -1 ) {
     roar_vio_close(file);
+    _seterr(ROAR_ERROR_INVAL); // Other value?
     return -1;
    }
@@ -285 +289 @@
    if ( roar_vio_lseek(file, 0, SEEK_SET) != 0 ) {
     roar_vio_close(file);
+   _seterrre();
     return -1;
    }
@@ -328 +333 @@
 int roar_vs_close(roar_vs_t * vss, int killit, int * error) {
  if ( killit != ROAR_VS_TRUE && killit != ROAR_VS_FALSE ) {
-  _seterr(ROAR_ERROR_UNKNOWN);
+  _seterr(ROAR_ERROR_INVAL);
   return -1;
  }