Changeset 5950:7fe8f5df7a83 in roaraudio for roarclients/roarcat.c

Timestamp:

10/20/13 13:52:15 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

code cleanup and again a patch for checking commandlion parameters

File:

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

roarclients/roarcat.c

@@ -82 +82 @@
 
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( !strcmp(k, "-n") ) {
+   ROAR_CKHAVEARGS(1);
    name = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
+   ROAR_CKHAVEARGS(1);
    info.rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--bits") || !strcmp(k, "-B") ) {
+   ROAR_CKHAVEARGS(1);
    info.bits = roar_str2bits(argv[++i]);
   } else if ( !strcmp(k, "-b") ) {
    info.bits = 8;
   } else if ( !strcmp(k, "--channels") || !strcmp(k, "--chans") || !strcmp(k, "-C") ) {
+   ROAR_CKHAVEARGS(1);
    info.channels = roar_str2channels(argv[++i]);
   } else if ( !strcmp(k, "-m") ) {
    info.channels = 1;
   } else if ( !strcmp(k, "--codec") || !strcmp(k, "-E") ) {
+   ROAR_CKHAVEARGS(1);
    if ( (info.codec = roar_str2codec(argv[++i])) == ROAR_AUDIO_INFO_INVALID ) {
     fprintf(stderr, "Error: Unknown codec: %s\n", argv[i]);
@@ -101 +107 @@
    }
   } else if ( !strcmp(k, "--aiprofile") ) {
+   ROAR_CKHAVEARGS(1);
    if ( roar_profile2info(&info, argv[++i]) == -1 ) {
     fprintf(stderr, "Error: Can not load audio profile: %s: %s\n", argv[i], roar_error2str(roar_error));
@@ -120 +127 @@
 
   } else if ( !strcmp(k, "--rel-id") ) {
+   ROAR_CKHAVEARGS(1);
    rel_id = atoi(argv[++i]);
   } else if ( !strcmp(k, "--role") ) {
+   ROAR_CKHAVEARGS(1);
    role = roar_str2role(argv[++i]);