[Pkg-running-devel] [antpm] 38/41: usb: fix warning storm

Kristof Ralovich ralovich-guest at moszumanska.debian.org
Tue Feb 23 21:46:47 UTC 2016


This is an automated email from the git hooks/post-receive script.

ralovich-guest pushed a commit to branch upstream
in repository antpm.

commit 7de2d3014eefb464fb3c9f3c9d4cdcb0d486b060
Author: RALOVICH, Kristof <tade60 at freemail.hu>
Date:   Tue Feb 23 22:16:28 2016 +0100

    usb: fix warning storm
---
 src/SerialUsb.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/SerialUsb.cpp b/src/SerialUsb.cpp
index c7e3967..8c09398 100644
--- a/src/SerialUsb.cpp
+++ b/src/SerialUsb.cpp
@@ -65,12 +65,15 @@ enum {
 
 
 
-#define LOG_USB_WARN(func, rv)                                          \
-  do { LOG(LOG_WARN) << func << ": " << rv << ": \"" << libusb_strerror(rv) << "\"\n"; } while(0)
+#define LOG_USB_WARN(func, rv)                      \
+  do {                                              \
+    LOG(LOG_WARN) << func << ": " << rv << ": \""   \
+                  << libusb_strerror((libusb_error)rv) << "\"\n"; \
+  } while(0)
 #define LOG_USB_WARN2(func, rv)                                         \
   do {                                                                  \
     LOG(LOG_WARN) << func << ": " << rv                                 \
-                  << ": \"" << libusb_strerror(rv) << "\"\n"            \
+                  << ": \"" << libusb_strerror((libusb_error)rv) << "\"\n"            \
                   << ": \"" << static_cast<char*>(strerror(rv)) << "\"\n"; \
   } while(0)
 
@@ -133,7 +136,7 @@ struct SerialUsbPrivate
     }
     if(irv)
     {
-      LOG_USB_WARN(libusb_control_transfer, irv);
+      LOG_USB_WARN("libusb_control_transfer", irv);
     }
 
     return irv==sz;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-running/antpm.git



More information about the Pkg-running-devel mailing list