fix windows compile error and remove linux compile warnings

[proxmark3-svn] / winsrc / command.cpp

diff --git a/winsrc/command.cpp b/winsrc/command.cpp
index c8fe40ea8572e9803fbc7ca69877c8986a191302..b5d3e3d7d69f2abc0fd652d92c8610594ce6c07c 100644 (file)
--- a/winsrc/command.cpp
+++ b/winsrc/command.cpp
@@ -639,7 +639,6 @@ static void ChkBitstream(char *str)
 static void CmdLosim(char *str)\r
 {\r
        int i;\r
 static void CmdLosim(char *str)\r
 {\r
        int i;\r

-       char *zero = "0";\r

 \r
        /* convert to bitstream if necessary */\r
        ChkBitstream(str);\r
 \r
        /* convert to bitstream if necessary */\r
        ChkBitstream(str);\r


@@ -704,7 +703,7 @@ static void CmdLoCommandRead(char *str)
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
        // in case they specified 'h'\r
        c.cmd = CMD_MOD_THEN_ACQUIRE_RAW_ADC_SAMPLES_125K;\r
        sscanf(str, "%i %i %i %s %s", &c.ext1, &c.ext2, &c.ext3, &c.d.asBytes,&dummy+1);\r
        // in case they specified 'h'\r

-       strcpy(&c.d.asBytes + strlen(c.d.asBytes),dummy);\r
+       strcpy((char *)&c.d.asBytes + strlen((char *)c.d.asBytes), dummy);\r

        SendCommand(&c, FALSE);\r
 }\r
 \r
        SendCommand(&c, FALSE);\r
 }\r
 \r


@@ -2027,8 +2026,7 @@ static void CmdFlexdemod(char *str)
 \r
 static void Cmdaskdemod(char *str) {\r
        int i;\r
 \r
 static void Cmdaskdemod(char *str) {\r
        int i;\r

-       int n = 0;\r
-       int c,high,low = 0;\r
+       int c, high = 0, low = 0;\r

 \r
        // TODO: complain if we do not give 2 arguments here !\r
        sscanf(str, "%i", &c);\r
 \r
        // TODO: complain if we do not give 2 arguments here !\r
        sscanf(str, "%i", &c);\r