projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "dbg: Watchdog resets while 'hw tune lf'"
[proxmark3-svn]
/
client
/
cmdcrc.c
diff --git
a/client/cmdcrc.c
b/client/cmdcrc.c
index fddf0ac4d53283253bab7a50554485f22a8f1e89..0ca2b8b1e00d816223d991f49d23978dc8f10739 100644
(file)
--- a/
client/cmdcrc.c
+++ b/
client/cmdcrc.c
@@
-8,7
+8,6
@@
// CRC Calculations from the software reveng commands
//-----------------------------------------------------------------------------
// CRC Calculations from the software reveng commands
//-----------------------------------------------------------------------------
-#include <stdlib.h>
#ifdef _WIN32
# include <io.h>
# include <fcntl.h>
#ifdef _WIN32
# include <io.h>
# include <fcntl.h>
@@
-19,8
+18,8
@@
#include <stdio.h>
#include <string.h>
#include <stdio.h>
#include <string.h>
-
//
#include <stdlib.h>
-
//
#include <ctype.h>
+#include <stdlib.h>
+#include <ctype.h>
#include "cmdmain.h"
#include "cmdcrc.h"
#include "reveng/reveng.h"
#include "cmdmain.h"
#include "cmdcrc.h"
#include "reveng/reveng.h"
@@
-41,14
+40,14
@@
int split(char *str, char *arr[MAX_ARGS]){
int wordCnt = 0;
while(1){
int wordCnt = 0;
while(1){
- while(isspace(str[beginIndex])){
+ while(isspace(
(unsigned char)
str[beginIndex])){
++beginIndex;
}
if(str[beginIndex] == '\0') {
break;
}
endIndex = beginIndex;
++beginIndex;
}
if(str[beginIndex] == '\0') {
break;
}
endIndex = beginIndex;
- while (str[endIndex] && !isspace(str[endIndex])){
+ while (str[endIndex] && !isspace(
(unsigned char)
str[endIndex])){
++endIndex;
}
int len = endIndex - beginIndex;
++endIndex;
}
int len = endIndex - beginIndex;
@@
-435,9
+434,9
@@
int CmdrevengTestC(const char *Cmd){
char result[30];
int dataLen;
char endian = 0;
char result[30];
int dataLen;
char endian = 0;
- dataLen = param_getstr(Cmd, cmdp++, inModel);
+ dataLen = param_getstr(Cmd, cmdp++, inModel
, sizeof(inModel)
);
if (dataLen < 4) return 0;
if (dataLen < 4) return 0;
- dataLen = param_getstr(Cmd, cmdp++, inHexStr);
+ dataLen = param_getstr(Cmd, cmdp++, inHexStr
, sizeof(inHexStr)
);
if (dataLen < 4) return 0;
bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
endian = param_getchar(Cmd, cmdp++);
if (dataLen < 4) return 0;
bool reverse = (param_get8(Cmd, cmdp++)) ? true : false;
endian = param_getchar(Cmd, cmdp++);
@@
-465,7
+464,7
@@
char *SwapEndianStr(const char *inStr, const size_t len, const uint8_t blockSize
// takes hex string in and searches for a matching result (hex string must include checksum)
int CmdrevengSearch(const char *Cmd){
char inHexStr[50] = {0x00};
// takes hex string in and searches for a matching result (hex string must include checksum)
int CmdrevengSearch(const char *Cmd){
char inHexStr[50] = {0x00};
- int dataLen = param_getstr(Cmd, 0, inHexStr);
+ int dataLen = param_getstr(Cmd, 0, inHexStr
, sizeof(inHexStr)
);
if (dataLen < 4) return 0;
char *Models[80];
if (dataLen < 4) return 0;
char *Models[80];
Impressum
,
Datenschutz