Changeset 5109:4f9fc788fe91 in roaraudio for roarclients/roarvio.c

Timestamp:

07/28/11 16:32:34 (13 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Started to use compiler attributes (Also see: #130)

File:

• roarclients/roarvio.c (modified) (3 diffs)

roarclients/roarvio.c

@@ -53 +53 @@
 }
 
-int do_explain (struct roar_vio_calls * cur) {
+ssize_t do_explain (struct roar_vio_calls * cur) {
  struct roar_sockname sockname;
  int                  have_sockname;
@@ -161 +161 @@
  struct roar_vio_calls vio0, vio1;
  enum action action = READ;
+ ssize_t written = -1;
  int i;
  char * k;
@@ -247 +248 @@
  switch (action) {
   case READ:
-    roar_vio_copy_data(roar_stdout, &vio0);
+    written = roar_vio_copy_data(roar_stdout, &vio0);
    break;
   case WRITE:
-    roar_vio_copy_data(&vio0, roar_stdin);
+    written = roar_vio_copy_data(&vio0, roar_stdin);
    break;
   case PASS:
-    roar_vio_copy_data(&vio1, &vio0);
+    written = roar_vio_copy_data(&vio1, &vio0);
    break;
   case EXPLAIN:
-    if ( do_explain(&vio0) == -1 )
+    if ( (written = do_explain(&vio0)) == -1 )
      ret = 4;
    break;
  }
 
- if ( roar_error != ROAR_ERROR_NONE ) {
+ if ( written == -1 ) {
   ROAR_ERR("Can not push data: %s", roar_error2str(roar_error));
  }