Changeset 5950:7fe8f5df7a83 in roaraudio for roarclients/roarshout.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/roarshout.c (modified) (3 diffs)

roarclients/roarshout.c

@@ -121 +121 @@
 
   if ( strcmp(k, "--server") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( strcmp(k, "--rate") == 0 || strcmp(k, "-R") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.rate = roar_str2rate(argv[++i]);
   } else if ( strcmp(k, "--bits") == 0 || strcmp(k, "-B") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.bits = roar_str2bits(argv[++i]);
   } else if ( strcmp(k, "--channels") == 0 || strcmp(k, "--chans") == 0 || strcmp(k, "-C") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.channels = roar_str2channels(argv[++i]);
   } else if ( strcmp(k, "--codec") == 0 || strcmp(k, "-E") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    info.codec = roar_str2codec(argv[++i]);
   } 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));
@@ -144 +150 @@
    s_public = 1;
   } else if ( strcmp(k, "-d") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    s_desc   = argv[++i];
   } else if ( strcmp(k, "-g") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    s_genre  = argv[++i];
   } else if ( strcmp(k, "-n") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    s_name   = argv[++i];
   } else if ( strcmp(k, "-u") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    s_url    = argv[++i];
   } else if ( strcmp(k, "-h") == 0 || strcmp(k, "--help") == 0 ) {
@@ -155 +165 @@
    return 0;
   } else if ( s_server == NULL ) {
+   ROAR_CKHAVEARGS(1);
    s_server = k;
   } else if ( s_port   == -1 ) {
+   ROAR_CKHAVEARGS(1);
    s_port   = atoi(k);
   } else if ( s_pw     == NULL ) {
+   ROAR_CKHAVEARGS(1);
    s_pw     = argv[i]; // do not use k here so k can be const.
   } else if ( s_mount  == NULL ) {
+   ROAR_CKHAVEARGS(1);
    s_mount  = k;
   } else {