Changeset 5148:73d76a74be61 in roaraudio for libroar/file.c

Timestamp:

10/15/11 14:29:29 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

improved error handling some more, marked some stuff as obsolete

File:

• libroar/file.c (modified) (16 diffs)

libroar/file.c

@@ -36 +36 @@
 #include "libroar.h"
 
-#define BUFSIZE 8192
-#define BUFMAX  65536
+#define BUFFERSIZE  8192
+#define BUFMAX     65536
 
 #ifdef ROAR_HAVE_IO_POSIX
@@ -97 +97 @@
 #endif
  int len;
- char buf[BUFSIZE];
+ char buf[BUFFERSIZE];
 #if defined(__linux__) && defined(ROAR_HAVE_IPV4)
  int cork_new = 1, cork_old;
@@ -118 +118 @@
  // TODO: try mmap here!
 
- while ((len = read(in, buf, BUFSIZE)) > 0)
+ while ((len = read(in, buf, BUFFERSIZE)) > 0)
   r += write(out, buf, len);
 
@@ -136 +136 @@
  int mmap_flags = 0;
  struct stat stat;
+
+ roar_debug_warn_obsolete("roar_file_map", NULL, NULL);
 
  if ( mem == NULL || filename == NULL )
@@ -183 +185 @@
 
 int     roar_file_unmap      (size_t len, void * mem) {
+ roar_debug_warn_obsolete("roar_file_unmap", NULL, NULL);
+
 #ifdef ROAR_HAVE_MMAP
  return munmap(mem, len);
@@ -205 +209 @@
  int seek;
  int len;
- char buf[BUFSIZE];
+ char buf[BUFFERSIZE];
  int rate = ROAR_RATE_DEFAULT, channels = ROAR_CHANNELS_DEFAULT, bits = ROAR_BITS_DEFAULT;
  struct roar_stream localstream[1];
@@ -213 +217 @@
  ROAR_DBG("roar_file_play_full(*) = ?");
 
- if ( !s )
+ if ( s == NULL )
   s = localstream;
 
- if ( !con )
-  return -1;
-
- if ( !file )
-  return -1;
-
- if ( exec && passfh )
-  return -1;
+ if ( con == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( file == NULL ) {
+  roar_err_set(ROAR_ERROR_FAULT);
+  return -1;
+ }
+
+ if ( exec && passfh ) {
+  roar_err_set(ROAR_ERROR_INVAL);
+  return -1;
+ }
 
 #ifdef ROAR_TARGET_WIN32
@@ -230 +240 @@
  if ( (in = open(file, O_RDONLY, 0644)) == -1 ) {
 #endif
-  return -1;
- }
-
- if ((len = read(in, buf, BUFSIZE)) < 1) {
+  roar_err_from_errno();
+  return -1;
+ }
+
+ if ((len = read(in, buf, BUFFERSIZE)) < 1) {
+  roar_err_from_errno();
   close(in);
   return -1;
@@ -245 +257 @@
 
  if ( codec == -1 ) {
-  ROAR_ERR("roar_file_play_full(*): Unknown codec of file: %s", file);
+  ROAR_WARN("roar_file_play_full(*): Unknown codec of file: %s", file);
   close(in);
+  roar_err_set(ROAR_ERROR_BADMAGIC);
   return -1;
  }
@@ -256 +269 @@
  if ( exec ) {
   if ( roar_stream_new(s, rate, channels, bits, codec) == -1 ) {
-   ROAR_ERR("roar_file_play_full(*): Can not create new stream. This is realy BAD!");
+   ROAR_DBG("roar_file_play_full(*): Can not create new stream. This is realy BAD!");
    close(in);
    return -1;
@@ -262 +275 @@
 
   if ( roar_stream_connect2(con, s, ROAR_DIR_PLAY, -1) == -1 ) {
-   ROAR_ERR("roar_file_play_full(*): Can not connect new stream to server.");
+   ROAR_DBG("roar_file_play_full(*): Can not connect new stream to server.");
    close(in);
    return -1;
@@ -268 +281 @@
 
   if ( roar_stream_exec(con, s) == -1 ) {
-   ROAR_ERR("roar_file_play_full(*): Can not exec new stream on server.");
+   ROAR_DBG("roar_file_play_full(*): Can not exec new stream on server.");
    close(in);
    return -1;
@@ -275 +288 @@
   roar_libroar_nowarn();
   if ( (out = roar_get_connection_fh(con)) == -1 ) {
-   ROAR_ERR("roar_file_play_full(*): Can not get socket of server connection for exec data transmition.");
+   ROAR_DBG("roar_file_play_full(*): Can not get socket of server connection for exec data transmition.");
    close(in);
    roar_libroar_warn();
@@ -311 +324 @@
   close(out);
 #else
- while ((len = read(in, buf, BUFSIZE)) > 0)
+ while ((len = read(in, buf, BUFFERSIZE)) > 0)
   if ( send(out, buf, len, 0) != len )
    break;
@@ -336 +349 @@
  return r;
 #else
+ roar_err_set(ROAR_ERROR_NOSYS);
  return -1;
 #endif
@@ -350 +364 @@
 #endif
 
+ roar_err_set(ROAR_ERROR_NODEV);
  return NULL;
 }