Changeset 5109:4f9fc788fe91 in roaraudio for roarclients

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)

Location:

roarclients

Files:

• Makefile (modified) (2 diffs)
• roarcat.c (modified) (2 diffs)
• roarcat2sock.c (modified) (1 diff)
• roarcatad.c (modified) (2 diffs)
• roarcatpassfh.c (modified) (2 diffs)
• roarcatplay.c (modified) (1 diff)
• roarcatsendfile.c (modified) (1 diff)
• roarinterconnect.c (modified) (1 diff)
• roarmon.c (modified) (2 diffs)
• roarmonhttp.c (modified) (1 diff)
• roarradio.c (modified) (1 diff)
• roarsocktypes.c (modified) (2 diffs)
• roarvio.c (modified) (3 diffs)

roarclients/Makefile

@@ -1 @@
-TARGETS_DEVEL=roartypes roarsocktypes roar-config
+TARGETS_DEVEL=roartypes roar-config
 TARGETS_EXAMPLE=roarvorbis roarsin
 TARGETS_IO=roarcat roarcatplay roarcatvio roarbidir roarmon roarmonhttp roarradio
@@ -8 +8 @@
 TARGETS_VIO=roarvio
 
-TARGETS_TESTS=pinentrytest zcattest pgptest pipetest polytest roarfctest
-TARGETS_OLD=roarcatad roarcat2sock roarcatsendfile roarcatpassfh
+#TARGETS_TESTS=pinentrytest zcattest pgptest pipetest polytest roarfctest
+#TARGETS_OLD=roarcatad roarcat2sock roarcatsendfile roarcatpassfh roarsocktypes
 
 TARGETS=$(TARGETS_IO) $(TARGETS_CTL) $(TARGETS_DSP) $(TARGETS_MISC) $(TARGETS_DEVEL) $(TARGETS_EXAMPLE) $(TARGETS_M) $(TARGETS_VIO)

roarclients/roarcat.c

@@ -187 +187 @@
  }
 
- if ( roar_stream_connect(&con, &s, dir) == -1 ) {
+ if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) {
   fprintf(stderr, "Error: can not connect stream to server\n");
   roar_disconnect(&con);
@@ -205 +205 @@
  }
 
- roar_vio_copy_data(stream, &file);
+ if ( roar_vio_copy_data(stream, &file) == -1 ) {
+  fprintf(stderr, "Error: can not copy data from source to server.\n");
+  roar_vio_close(stream);
+  roar_vio_close(&file);
+  return 14;
+ }
 
  roar_vio_close(stream);

roarclients/roarcat2sock.c

@@ -55 +55 @@
 
 
+ roar_debug_bin_obsolete(argv[0], "roarcat", NULL);
+
  for (i = 1; i < argc; i++) {
   k = argv[i];

roarclients/roarcatad.c

@@ -56 +56 @@
 
 
+ roar_debug_bin_obsolete(argv[0], "roarcat", NULL);
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -87 +89 @@
  }
 
- if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY) == -1 ) {
+ if ( roar_stream_connect2(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) {
   roar_disconnect(&con);
   return 1;

roarclients/roarcatpassfh.c

@@ -56 +56 @@
 
 
+ roar_debug_bin_obsolete(argv[0], "roarcat", NULL);
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -89 +91 @@
  }
 
- if ( roar_stream_connect(&con, &s, ROAR_DIR_PLAY) == -1 ) {
+ if ( roar_stream_connect2(&con, &s, ROAR_DIR_PLAY, -1) == -1 ) {
   roar_disconnect(&con);
   return 1;

roarclients/roarcatplay.c

@@ -96 +96 @@
 #endif
 
+ if ( mode == MODE_PASSIVE ) {
+  fprintf(stderr, "Warning: passive mode is obsoleted and will be removed soon.\n");
+ }
+
  if ( file == NULL )
   file = "/dev/stdin";

roarclients/roarcatsendfile.c

@@ -54 +54 @@
  int    in = -1;
 
+ roar_debug_bin_obsolete(argv[0], "roarcat", NULL);
+
  for (i = 1; i < argc; i++) {
   k = argv[i];

roarclients/roarinterconnect.c

@@ -501 +501 @@
  }
 
- if ( roar_stream_connect(con, stream, localdir) == -1 ) {
+ if ( roar_stream_connect2(con, stream, localdir, -1) == -1 ) {
   roar_disconnect(con);
   return 22;

roarclients/roarmon.c

@@ -198 +198 @@
  }
 
- if ( roar_stream_connect(&con, &s, dir) == -1 ) {
+ if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) {
   fprintf(stderr, "Error: can not connect stream to server\n");
   roar_disconnect(&con);
@@ -227 +227 @@
 // ROAR_SHUTDOWN(fh, SHUT_WR); // we need to have something do do shutdowns here...
 
- roar_vio_copy_data(&file, stream);
+ if ( roar_vio_copy_data(&file, stream) == -1 ) {
+  fprintf(stderr, "Error: can not copy data from stream to destination\n");
+  roar_vio_close(stream);
+  roar_vio_close(&file);
+  return 14;
+ }
 
  roar_vio_close(stream);

roarclients/roarmonhttp.c

@@ -331 +331 @@
  }
 
- if ( roar_stream_connect(&con, &s, dir) == -1 ) {
+ if ( roar_stream_connect2(&con, &s, dir, -1) == -1 ) {
   roar_disconnect(&con);
   return 11;

roarclients/roarradio.c

@@ -211 +211 @@
  }
 
- if ( roar_stream_connect(con, stream, ROAR_DIR_PLAY) == -1 ) {
+ if ( roar_stream_connect2(con, stream, ROAR_DIR_PLAY, -1) == -1 ) {
   roar_disconnect(con);
   return 1;

roarclients/roarsocktypes.c

@@ -26 +26 @@
 #include <roaraudio.h>
 
-int main (void) {
+int main (int argc, char * argv[]) {
  int i, fh;
  struct {
@@ -44 +44 @@
  };
 
+ roar_debug_bin_obsolete(argv[0], NULL, NULL);
+
  for (i = 0; tests[i].func; i++) {
   printf("Type %-16s ", tests[i].name);

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));
  }