Make cppcheck happier

nspire-emus · Jan 15, 2016 · 97c5888 · 97c5888
1 parent 063d944
commit 97c5888
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/core/lcd.c b/core/lcd.c
@@ -20,7 +20,7 @@ void lcd_draw_frame(uint8_t *buffer) {
     }
     int row;
     for (row = 0; row < 230; ++row) {
-        uint32_t pal_shift = lcd.control & (1 << 8) ? 11 : 1;
+        uint32_t pal_shift = (lcd.control & (1 << 8)) ? 11 : 1;
         int words = (320 / 32) * bpp;
         uint8_t *out = buffer + (row * 160);
         if (bpp < 16) {
@@ -41,14 +41,14 @@ void lcd_draw_frame(uint8_t *buffer) {
                 } while (bitpos != 0);
             } while (--words != 0);
         } else if (bpp == 16) {
-            uint32_t shift1 = pal_shift | (lcd.control & (1 << 9) ? 16 : 0);
+            uint32_t shift1 = pal_shift | ((lcd.control & (1 << 9)) ? 16 : 0);
             uint32_t shift2 = shift1 ^ 16;
             do {
                 uint32_t word = *in++;
                 *out++ = (word >> shift1 & 15) << 4 | (word >> shift2 & 15);
             } while (--words != 0);
         } else {
-            uint32_t shift = lcd.control & (1 << 8) ? 20 : 4;
+            uint32_t shift = (lcd.control & (1 << 8)) ? 20 : 4;
             do {
                 int color1 = *in++ >> shift;
                 int color2 = *in++ >> shift & 15;

diff --git a/core/os/os-win32.c b/core/os/os-win32.c
@@ -95,7 +95,7 @@ void os_unmap_cow(void *addr, size_t size)
 }
 
 static int addr_cache_exception(PEXCEPTION_RECORD er, void *x, void *y, void *z) {
-    x = x; y = y; z = z; // unused parameters
+    (void) x; (void) y; (void) z;
     if (er->ExceptionCode == EXCEPTION_ACCESS_VIOLATION) {
         if (addr_cache_pagefault((void *)er->ExceptionInformation[1]))
             return 0; // Continue execution

diff --git a/qtframebuffer.h b/qtframebuffer.h
@@ -6,7 +6,7 @@
 class QMLFramebuffer : public QQuickPaintedItem
 {
 public:
-    QMLFramebuffer(QQuickItem *parent = 0);
+    explicit QMLFramebuffer(QQuickItem *parent = 0);
     virtual void paint(QPainter *p) override;
 };
 

diff --git a/usblinktreewidget.h b/usblinktreewidget.h
@@ -10,7 +10,7 @@ class USBLinkTreeWidget : public QTreeWidget
     Q_OBJECT
 
 public:
-    USBLinkTreeWidget(QWidget *parent = 0);
+    explicit USBLinkTreeWidget(QWidget *parent = 0);
 
     // usblink callbacks
     static void usblink_dirlist_callback_nested(struct usblink_file *file, bool is_error, void *data);