Fix linter warnings

appveyor.yml

@@ -28,12 +28,11 @@ install:
   - cd C:\projects\winusb-driver-generator
   - git submodule update --init --recursive
   - ps: Install-Product node $env:nodejs_version $env:TARGET_ARCH
-  - npm install
+  - npm install --build-from-source
+  - pip install cpplint
 
 build: off
 
 test_script:
-  - npm run configure
-  - npm run build
   - npm test
   - node test.js

binding.gyp

@@ -23,6 +23,7 @@
       ],
       "include_dirs" : [
         "<!(node -e \"require('nan')\")",
+        '.'
       ],
       "conditions": [
         [ 'OS=="win"', {

src/generator.cpp

@@ -14,9 +14,10 @@
  * limitations under the License.
  */
 
-#include "generator.h"
+#include "src/generator.h"
 
-static int generator_list_driverless_devices(struct wdi_device_info **result) {
+static int
+generator_list_driverless_devices(struct wdi_device_info **result) {
   struct wdi_options_create_list options_list = { 0 };
 
   // Only enumerate devices without a driver
@@ -37,10 +38,13 @@ NAN_METHOD(hasDriver) {
     return Nan::ThrowError("Vendor id must be a number");
   }
 
-  const unsigned short vendor = info[0]->Uint32Value();
-  const unsigned short product = info[1]->Uint32Value();
+  const uint16_t vendor = info[0]->Uint32Value();
+  const uint16_t product = info[1]->Uint32Value();
 
-  std::cout << "Searching for device: " << std::hex << "0x" << vendor << ":0x" << product << std::endl;
+  std::cout << "Searching for device: " << std::hex
+    << "0x" << vendor
+    << ":0x" << product
+    << std::endl;
   wdi_set_log_level(WDI_LOG_LEVEL_WARNING);
 
   bool found = false;
@@ -49,7 +53,8 @@ NAN_METHOD(hasDriver) {
 
   code = generator_list_driverless_devices(&device_list_node);
   if (code == WDI_SUCCESS) {
-    for (; device_list_node != NULL; device_list_node = device_list_node->next) {
+    for (; device_list_node != NULL
+         ; device_list_node = device_list_node->next) {
       std::cout << "Found: " << std::hex
         << "0x" << device_list_node->vid
         << ":0x" << device_list_node->pid
@@ -78,13 +83,15 @@ NAN_METHOD(hasDriver) {
   // can assume every device has a driver, including the
   // one the user asked about.
   } else if (code == WDI_ERROR_NO_DEVICE) {
-    std::cout << "No driverless device detected. Assuming device has a driver" << std::endl;
+    std::cout << "No driverless device detected. "
+                 "Assuming device has a driver" << std::endl;
     found = true;
   } else {
     if (code == WDI_ERROR_RESOURCE) {
       Nan::ThrowError("Memory could not be allocated internally");
     } else if (code == WDI_ERROR_BUSY) {
-      Nan::ThrowError("Another instance of this function call is already in process");
+      Nan::ThrowError("Another instance of this function call"
+                      "is already in process");
     } else {
       Nan::ThrowError("Unknown error");
     }

src/generator.h

@@ -17,16 +17,17 @@
  * limitations under the License.
  */
 
-#include <nan.h>
-#include <iostream>
 #include <stdio.h>
+#include <nan.h>
 #include <libwdi.h>
+#include <iostream>
 
 // Pragmas recommended by libwdi
 #if defined(_PREFAST_)
-// Disable "Banned API Usage:" errors when using WDK's OACR/Prefast */
+// Disable "Banned API Usage:" errors when using WDK's OACR/Prefast
 #pragma warning(disable:28719)
-// Disable "Consider using 'GetTickCount64' instead of 'GetTickCount'" when using WDK's OACR/Prefast */
+// Disable "Consider using 'GetTickCount64' instead of
+// 'GetTickCount'" when using WDK's OACR/Prefast
 #pragma warning(disable:28159)
 #endif
 

test.js

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
-const winusbDriverGenerator = require('.')
+'use strict';
 
-console.log(winusbDriverGenerator.hasDriver(0x0a5c, 0x2764))
+const winusbDriverGenerator = require('.');
+
+console.log(winusbDriverGenerator.hasDriver(0x0a5c, 0x2764));