Changeset 5945:513aedefab60 in roaraudio for roarclients

Timestamp:

10/15/13 13:33:26 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated checks on commandlion parameters (Closes: DEB#716264, DEB#716251, DEB#716245, DEB#716240)

Location:

roarclients

Files:

• roarclientpass.c (modified) (4 diffs)
• roardtmf.c (modified) (1 diff)
• roarinterconnect.c (modified) (1 diff)
• roarlight.c (modified) (3 diffs)

roarclients/roarclientpass.c

@@ -152 +152 @@
 
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( !strcmp(k, "--stdin") ) {
@@ -162 +163 @@
    cflags |= F_STDIN|F_STDOUT;
   } else if ( !strcmp(k, "--client-fh") ) {
+   ROAR_CKHAVEARGS(1);
    clientfh = atoi(argv[++i]);
   } else if ( !strcmp(k, "--proto") ) {
+   ROAR_CKHAVEARGS(1);
    proto = roar_str2proto(argv[++i]);
   } else if ( !strcmp(k, "--byteorder") ) {
+   ROAR_CKHAVEARGS(1);
    byteorder = roar_str2byteorder(argv[++i]);
   } else if ( !strcmp(k, "--listen") ) {
    flags |= ROAR_CLIENTPASS_FLAG_LISTEN;
   } else if ( !strcmp(k, "--command") ) {
+   ROAR_CKHAVEARGS(1);
    k = argv[++i];
    if ( !strcasecmp(k, "passfh") ) {
@@ -180 +185 @@
    }
   } else if ( !strcmp(k, "--mode") ) {
+   ROAR_CKHAVEARGS(1);
    k = argv[++i];
    if ( !strcasecmp(k, "none") ) {
@@ -195 +201 @@
    }
   } else if ( !strcmp(k, "--bind") ) {
+   ROAR_CKHAVEARGS(1);
    host = argv[++i];
   } else if ( !strcmp(k, "--port") ) {
+   ROAR_CKHAVEARGS(1);
    port = atoi(argv[++i]);
   } else if ( !strcmp(k, "--help") || !strcmp(k, "-h") ) {

roarclients/roardtmf.c

@@ -78 +78 @@
 
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( !strcmp(k, "--rate") || !strcmp(k, "-r") || !strcmp(k, "-R") ) {
+   ROAR_CKHAVEARGS(1);
    rate = roar_str2rate(argv[++i]);
   } else if ( !strcmp(k, "--mode-dtmf") ) {

roarclients/roarinterconnect.c

@@ -280 +280 @@
 
   if ( strcmp(k, "--server") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( strcmp(k, "--remote") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    remote = argv[++i];
   } else if ( strcmp(k, "--type") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    type = parse_type(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));

roarclients/roarlight.c

@@ -139 +139 @@
 
   } else if ( !strcmp(k, "sleep") ) {
+   ROAR_CKHAVEARGS(1);
    roar_sleep(atoi(argv[++i]));
 
   } else if ( !strcmp(k, "sset") || !strcmp(k, "set") ) {
+   ROAR_CKHAVEARGS(1);
    i++;
    if ( cmd_sset(argv[i]) == -1 ) {
@@ -149 +151 @@
    }
   } else if ( !strcmp(k, "event") ) {
+   ROAR_CKHAVEARGS(1);
    i++;
    if ( cmd_event(argv[i]) == -1 ) {
@@ -250 +253 @@
 
   if ( !strcmp(k, "--server") || !strcmp(k, "-s") ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( !strcmp(k, "--mixer") ) {
+   ROAR_CKHAVEARGS(1);
    mixer = atoi(argv[++i]);
   } else if ( !strcmp(k, "--codec") ) {