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

roarclients/roarctl.c

@@ -1212 +1212 @@
 
   if ( strcmp(k, "--server") == 0 ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
   } else if ( strcmp(k, "-v") == 0 || strcmp(k, "--verbose") == 0 ) {
@@ -1262 +1263 @@
 
   } else if ( !strcmp(k, "sleep") ) {
+   ROAR_CKHAVEARGS(1);
    roar_sleep(atoi(argv[++i]));
 
   } else if ( !strcmp(k, "ping") ) {
+   ROAR_CKHAVEARGS(1);
 #ifdef ROAR_HAVE_GETTIMEOFDAY
    if ( ping(&con, atoi(argv[++i])) == -1 ) {
@@ -1342 +1345 @@
    list_clients(&con);
   } else if ( !strcmp(k, "clientinfo") ) {
+   ROAR_CKHAVEARGS(1);
    display_client(&con, atoi(argv[++i]));
   } else if ( !strcmp(k, "liststreams") ) {
    list_streams(&con);
   } else if ( !strcmp(k, "streaminfo") ) {
+   ROAR_CKHAVEARGS(1);
    display_stream(&con, atoi(argv[++i]));
   } else if ( !strcmp(k, "allinfo") ) {
@@ -1361 +1366 @@
 
   } else if ( !strcmp(k, "kick") ) {
+   ROAR_CKHAVEARGS(2);
    t = roar_str2ot((k = argv[++i]));
    if ( t == -1 ) {
@@ -1374 +1380 @@
 
   } else if ( !strcmp(k, "newvirtual") ) {
+   ROAR_CKHAVEARGS(6);
    if ( newvirtual(&con, argv[i+1], argv[i+2], argv[i+3], argv[i+4], argv[i+5], argv[i+6]) == -1 ) {
     fprintf(stderr, "Error: can not create new virtual stream\n");
@@ -1382 +1389 @@
 
   } else if ( !strcmp(k, "volume") ) {
+   ROAR_CKHAVEARGS(2); /* we may need more, but this is the minimum */
    if ( set_mixer(&con, &i, argc, argv) == -1 ) {
     fprintf(stderr, "Error: can not set volume\n");
@@ -1389 +1397 @@
 
   } else if ( !strcmp(k, "flag") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( set_flags(&con, atoi(argv[i]), ROAR_SET_FLAG, argv[i+1]) == -1 ) {
@@ -1397 +1406 @@
    i++;
   } else if ( !strcmp(k, "unflag") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( set_flags(&con, atoi(argv[i]), ROAR_RESET_FLAG, argv[i+1]) == -1 ) {
@@ -1405 +1415 @@
    i++;
   } else if ( !strcmp(k, "toggleflag") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( set_flags(&con, atoi(argv[i]), ROAR_TOGGLE_FLAG, argv[i+1]) == -1 ) {
@@ -1413 +1424 @@
    i++;
   } else if ( !strcmp(k, "protectflag") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( set_flags(&con, atoi(argv[i]), ROAR_NOOP_FLAG|ROAR_PROTECT_FLAG, argv[i+1]) == -1 ) {
@@ -1422 +1434 @@
 
   } else if ( !strcmp(k, "role") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( set_role(&con, atoi(argv[i]), roar_str2role(argv[i+1])) == -1 ) {
@@ -1431 +1444 @@
 
   } else if ( !strcmp(k, "metaset") ) {
+   ROAR_CKHAVEARGS(4);
    i++;
    if ( set_meta(&con, atoi(argv[i]), argv[i+1], argv[i+2], argv[i+3]) == -1 ) {
@@ -1439 +1453 @@
    i += 3;
   } else if ( !strcmp(k, "metaget") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( show_meta_type(&con, atoi(argv[i]), argv[i+1]) == -1 ) {
@@ -1445 +1460 @@
    i++;
   } else if ( !strcmp(k, "metasave") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( save_meta(&con, atoi(argv[i]), argv[i+1]) == -1 ) {
@@ -1453 +1469 @@
    i++;
   } else if ( !strcmp(k, "metaload") ) {
+   ROAR_CKHAVEARGS(2);
    i++;
    if ( load_meta(&con, atoi(argv[i]), argv[i+1]) == -1 ) {
@@ -1467 +1484 @@
    }
   } else if ( !strcmp(k, "aiprofileget") || !strcmp(k, "profileget") ) {
+   ROAR_CKHAVEARGS(1);
    i++;
    if ( show_aiprofile(argv[i]) == -1 ) {