chg: Code refactor - remove g++ warnings !minor

lcgamboa · Jan 11, 2024 · 9155434 · 9155434
1 parent c02a9f6
commit 9155434
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 13 deletions.
diff --git a/src/boards/board_RemoteTCP.cc b/src/boards/board_RemoteTCP.cc
@@ -622,7 +622,7 @@ void cboard_RemoteTCP::EvThreadRun(CThread& thread) {
         }
 
         dprintf("MSG type = %i size=%i  timestamp= %lu  ", cmd_header.msg_type, cmd_header.payload_size,
-                cmd_header.time);
+                (long unsigned int)cmd_header.time);
 
         switch (cmd_header.msg_type) {
             case VB_PINFO: {
@@ -957,7 +957,7 @@ void cboard_RemoteTCP::EvThreadRun(CThread& thread) {
                     ConnectionError("send_cmd");
                     break;
                 }
-                dprintf("VB_PREAD  reg[%x] = %x \n", addr, ntohl(payload[1]));
+                dprintf("VB_PREAD  reg[%x] = %x \n", addr, (unsigned int)ntohl(payload[1]));
             } break;
             case VB_QUIT:
                 send_cmd(VB_QUIT);

diff --git a/src/devices/sdcard.cc b/src/devices/sdcard.cc
@@ -110,7 +110,7 @@ static unsigned char buff[512];
 
 unsigned short sdcard_io(sdcard_t* sd, unsigned char mosi, unsigned char clk, unsigned char ss) {
     unsigned int offset = 0;
-    unsigned short crc16;
+    unsigned short crc16 = 0;
 
     if (!sd->card_present) {
         return 1;
@@ -592,10 +592,7 @@ void sdcard_set_filename(sdcard_t* sd, const char* fname) {
         sd->card_present = 1;
 
         sd->disk_size = sb.st_size >> 10;
-#ifdef _WIN_
-        dprintf("sdcard size=%li kb  ->  %lli blocks\n", sd->disk_size, sb.st_size / 512);
-#else
-        dprintf("sdcard size=%li kb  ->  %li blocks\n", sd->disk_size, sb.st_size / 512);
-#endif
+
+        dprintf("sdcard size=%li kb  ->  %li blocks\n", sd->disk_size, (long)(sb.st_size / 512));
     }
 }
diff --git a/src/devices/uart.h b/src/devices/uart.h
@@ -26,9 +26,10 @@
 #ifndef UART
 #define UART
 
+#include "bitbang_uart.h"
+
 #include <stdio.h>
 #include "../lib/serial_port.h"
-#include "bitbang_uart.h"
 
 typedef struct {
     unsigned char connected;

diff --git a/src/lib/rcontrol.cc b/src/lib/rcontrol.cc
@@ -41,11 +41,11 @@
 #include <sys/un.h>
 #include <sys/unistd.h>
 #else
-#include <winsock.h>
+#include <winsock2.h>
 #ifndef MSG_WAITALL
 #define MSG_WAITALL (1 << 3)
-#define MSG_NOSIGNAL 0
 #endif
+#define MSG_NOSIGNAL 0
 #endif
 // system headers independent
 #include <errno.h>

diff --git a/src/parts/input_ADXL345.h b/src/parts/input_ADXL345.h
@@ -63,7 +63,7 @@ class cpart_ADXL345 : public part {
     lxFont font_p;
     unsigned char active[3];
     double asens;
-    double gsens;
+    // double gsens;
     unsigned char ret_;
 };
 

diff --git a/src/picsimlab1.cc b/src/picsimlab1.cc
@@ -324,7 +324,7 @@ void CPWindow1::timer2_EvOnTime(CControl* control) {
 #ifndef __EMSCRIPTEN__
         Message_sz(lxString::FromUTF8(PICSimLab.GetError(0)), 600, 240);
 #else
-        printf("Error: %s\n", PICSimLab.GetError(0)._str());
+        printf("Error: %s\n", PICSimLab.GetError(0).c_str());
 #endif
         PICSimLab.DeleteError(0);
     }