From: Pavel A <pavel_a@live.com>
Date: Sat, 2 Apr 2016 23:07:10 +0000 (+0300)
Subject: Fixup merge...
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=85fe04b805681646aeff75fabb6cd3f068de7e03;p=usb-relay-hid.git

Fixup merge...
---

85fe04b805681646aeff75fabb6cd3f068de7e03
diff --cc commandline/usbrelay-cmd.c
index de5d01c,3d98398..4667f58
--- a/commandline/usbrelay-cmd.c
+++ b/commandline/usbrelay-cmd.c
@@@ -1,9 -1,8 +1,8 @@@
- // Chinese USB/HID relay command line tool:
 -// Command line tool for Chinese USB/HID relays
++// Command line tool for low-cost USB/HID relays
  //
- // pa02 20-Nov-2014 supports 1,2,4 - relay devices
+ // pa02 20-Nov-2014 supports 1,2,4,8 - relay devices
  //
- // Build for Windows: using VC++ 2008 and WDK7.1
- //~~~~~~~~~~~~~~~~~~~~~~~~
+ //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  /* Prototype: V-USB example: vusb-20121206/examples/hid-data/commandline/hidtool.c 
   * Author: Christian Starkjohann
@@@ -361,9 -344,8 +343,9 @@@ int main(int argc, char **argv
      }
  
      if ( strncasecmp(arg1, "id=", 3) == 0 ) {
 +        /* Set the ID for following commands. else use 1st found device.*/
-         if (strlen(&arg1[3]) != 5) {
-             fprintf(stderr, "ERROR: ID must be 5 characters (%s)\n", arg1);
+         if (strlen(&arg1[3]) != USB_RELAY_ID_STR_LEN) {
+             printerr("ERROR: ID must be %d characters (%s)\n", USB_RELAY_ID_STR_LEN, arg1);
              return 1;
          }
          
@@@ -396,4 -379,4 +378,3 @@@
      return err;
  }
  
--/* ------------------------------------------------------------------------- */