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

roarclients/roarsin.c

@@ -97 +97 @@
 
 int main (int argc, char * argv[]) {
+ const char * k;
  const char * server = NULL;
  int rate     = ROAR_RATE_DEFAULT;
@@ -112 +113 @@
 
  for (i = 1; i < argc; i++) {
-  if ( !strcmp(argv[i], "--freq") ) {
+  k = argv[i];
+  if ( !strcmp(k, "--freq") ) {
+   ROAR_CKHAVEARGS(1);
    freq   = atof(argv[++i]);
-  } else if ( !strcmp(argv[i], "--time") ) {
+  } else if ( !strcmp(k, "--time") ) {
+   ROAR_CKHAVEARGS(1);
    length = atof(argv[++i]);
-  } else if ( !strcmp(argv[i], "--server") ) {
+  } else if ( !strcmp(k, "--server") ) {
+   ROAR_CKHAVEARGS(1);
    server = argv[++i];
-  } else if ( !strcmp(argv[i], "--rate") || !strcmp(argv[i], "-R") ) {
+  } else if ( !strcmp(k, "--rate") || !strcmp(k, "-R") ) {
+   ROAR_CKHAVEARGS(1);
    rate = roar_str2rate(argv[++i]);
-  } else if ( !strcmp(argv[i], "--volume") ) {
+  } else if ( !strcmp(k, "--volume") ) {
+   ROAR_CKHAVEARGS(1);
    volume = atof(argv[++i]);
-  } else if ( !strcmp(argv[i], "--sin") ) {
+  } else if ( !strcmp(k, "--sin") ) {
    func   = sin;
-  } else if ( !strcmp(argv[i], "--rect") ) {
+  } else if ( !strcmp(k, "--rect") ) {
    func   = rect;
-  } else if ( !strcmp(argv[i], "--saw") ) {
+  } else if ( !strcmp(k, "--saw") ) {
    func   = saw;
-  } else if ( !strcmp(argv[i], "--tri") ) {
+  } else if ( !strcmp(k, "--tri") ) {
    func   = tri;
-  } else if ( !strcmp(argv[i], "--trap") ) {
+  } else if ( !strcmp(k, "--trap") ) {
    func   = trap;
-  } else if ( !strcmp(argv[i], "--help") ) {
+  } else if ( !strcmp(k, "--help") ) {
    usage(argv[0]);
    return 0;