Changeset 5162:85c55ccd12a9 in roaraudio for roard/sources.c

Timestamp:

10/16/11 20:12:40 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

fixed some compiler warnings

File:

• roard/sources.c (modified) (2 diffs)

roard/sources.c

@@ -233 +233 @@
  }
 
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream); // ignore errors here
- roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAMID, &stream)); // ignore errors here
+ _LIBROAR_IGNORE_RET(roar_vio_ctl(&(ss->vio), ROAR_VIO_CTL_SET_SSTREAM,   s)); // ignore errors here
 
  if ( f_sync ) {
@@ -251 +251 @@
  struct roar_stream_server * ss;
 
- if ( fh > -1 )
-  return streams_set_fh(stream, fh);
-
  streams_get(stream, &ss);
 
- if ( roar_vio_open_file(&(ss->vio), device, O_RDONLY, 0644) == -1 )
-  return -1;
+ if ( fh > -1 ) {
+  if ( roar_vio_open_fh(&(ss->vio), fh) == -1 )
+   return -1;
+ } else {
+  if ( roar_vio_open_file(&(ss->vio), device, O_RDONLY, 0644) == -1 )
+   return -1;
+ }
 
  return streams_set_fh(stream, -2);