From f8f39d61963feeed130b74d503329bd9488af3b2 Mon Sep 17 00:00:00 2001
From: iceman1001 <iceman@iuse.se>
Date: Tue, 30 Apr 2019 22:03:20 +0200
Subject: [PATCH] fix: passing a struct.

---
 client/comms.c     | 2 +-
 client/proxmark3.c | 2 +-
 uart/uart.h        | 2 +-
 uart/uart_posix.c  | 2 +-
 uart/uart_win32.c  | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/client/comms.c b/client/comms.c
index 9b8d9e7eb..5bff3c13b 100644
--- a/client/comms.c
+++ b/client/comms.c
@@ -608,7 +608,7 @@ int TestProxmark(void) {
             
             // reconfigure.
             if ( conn.send_via_fpc == false ) {
-                uart_reconfigure_timeouts(&sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
+                uart_reconfigure_timeouts(sp, UART_USB_CLIENT_RX_TIMEOUT_MS );
             }
            
             return PM3_SUCCESS;
diff --git a/client/proxmark3.c b/client/proxmark3.c
index d3193040b..87e4ee814 100644
--- a/client/proxmark3.c
+++ b/client/proxmark3.c
@@ -157,7 +157,7 @@ main_loop(char *script_cmds_file, char *script_cmd, bool pm3_present) {
                     // clear array
                     memset(script_cmd_buf, 0, sizeof(script_cmd_buf));
                     // get
-                    if (!fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin)) {
+                    if (fgets(script_cmd_buf, sizeof(script_cmd_buf), stdin) == NULL) {
                         PrintAndLogEx(ERR, "STDIN unexpected end, exit...");
                         break;
                     }
diff --git a/uart/uart.h b/uart/uart.h
index f803655be..24c1063a3 100644
--- a/uart/uart.h
+++ b/uart/uart.h
@@ -107,6 +107,6 @@ uint32_t uart_get_speed(const serial_port sp);
 
 /* Reconfigure timeouts
  */
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value );
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value );
 #endif // _UART_H_
 
diff --git a/uart/uart_posix.c b/uart/uart_posix.c
index 87559ff88..f1bb0b733 100644
--- a/uart/uart_posix.c
+++ b/uart/uart_posix.c
@@ -73,7 +73,7 @@ struct timeval timeout = {
     .tv_usec = UART_FPC_CLIENT_RX_TIMEOUT_MS * 1000
 };
 
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value ) {
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value ) {
     timeout.tv_usec = value * 1000;
     return PM3_SUCCESS;
 }
diff --git a/uart/uart_win32.c b/uart/uart_win32.c
index 0096304d0..6fc30ce47 100644
--- a/uart/uart_win32.c
+++ b/uart/uart_win32.c
@@ -48,9 +48,10 @@ typedef struct {
     COMMTIMEOUTS ct;  // Serial port time-out configuration
 } serial_port_windows;
 
-int uart_reconfigure_timeouts(serial_port *sp, uint32_t value) {
+int uart_reconfigure_timeouts(serial_port sp, uint32_t value) {
     
-    serial_port_windows *spw = (serial_port_windows*)sp;
+    serial_port_windows *spw;
+    spw = (serial_port_windows *)sp;
     spw->ct.ReadIntervalTimeout         = value;
     spw->ct.ReadTotalTimeoutMultiplier  = 0;
     spw->ct.ReadTotalTimeoutConstant    = value;