github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 05:13:46 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

cppcheck

Browse source
This commit is contained in:
iceman1001 2022-01-06 23:25:25 +01:00
commit 81c6918ac5
5 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

26
client/deps/hardnested/hardnested_tables.c
View file

@ -93,41 +93,49 @@ static inline void clear_bitarray24(uint32_t *bitarray) {
memset(bitarray, 0x00, sizeof(uint32_t) * (1 << 19));
}
static inline uint32_t test_bit24(uint32_t *bitarray, uint32_t index) {
static inline uint32_t test_bit24(const uint32_t *bitarray, uint32_t index) {
return bitarray[index >> 5] & (0x80000000 >> (index & 0x0000001f));
}
static inline void set_bit24(uint32_t *bitarray, uint32_t index) {
bitarray[index >> 5] |= 0x80000000 >> (index & 0x0000001f);
}
static inline uint32_t next_state(const uint32_t *bitset, uint32_t state) {
if (++state == 1 << 24) {
return 1 << 24;
}
static inline uint32_t next_state(uint32_t *bitset, uint32_t state) {
if (++state == 1 << 24) return 1 << 24;
uint32_t index = state >> 5;
uint_fast8_t bit = state & 0x1f;
uint32_t line = bitset[index] << bit;
while (bit <= 0x1f) {
if (line & 0x80000000) return state;
if (line & 0x80000000) {
return state;
}
state++;
bit++;
line <<= 1;
}
index++;
while (bitset[index] == 0x00000000 && state < 1 << 24) {
index++;
state += 0x20;
}
if (state >= 1 << 24) return 1 << 24;
if (state >= 1 << 24) {
return 1 << 24;
}
#if defined __GNUC__
return state + __builtin_clz(bitset[index]);
#else
bit = 0x00;
line = bitset[index];
while (bit <= 0x1f) {
if (line & 0x80000000) return state;
if (line & 0x80000000) {
return state;
}
state++;
bit++;
line <<= 1;
@ -137,7 +145,7 @@ static inline uint32_t next_state(uint32_t *bitset, uint32_t state) {
}
static inline uint32_t next_not_state(uint32_t *bitset, uint32_t state) {
static inline uint32_t next_not_state(const uint32_t *bitset, uint32_t state) {
if (++state == 1 << 24) return 1 << 24;
uint32_t index = state >> 5;
uint_fast8_t bit = state & 0x1f;

2
client/src/fileutils.c
View file

@ -686,7 +686,7 @@ int saveFileJSONrootEx(const char *preferredName, void *root, size_t flags, bool
return PM3_EFILE;
}
int saveFileWAVE(const char *preferredName, int *data, size_t datalen) {
int saveFileWAVE(const char *preferredName, const int *data, size_t datalen) {
if (data == NULL) return PM3_EINVARG;
char *fileName = newfilenamemcopy(preferredName, ".wav");

2
client/src/fileutils.h
View file

@ -127,7 +127,7 @@ int saveFileJSONrootEx(const char *preferredName, void *root, size_t flags, bool
* @param datalen the length of the data
* @return 0 for ok
*/
int saveFileWAVE(const char *preferredName, int *data, size_t datalen);
int saveFileWAVE(const char *preferredName, const int *data, size_t datalen);
/** STUB
* @brief Utility function to save PM3 data to a file. This method takes a preferred name, but if that

12
client/src/graph.c
View file

@ -72,8 +72,8 @@ void save_restoreGB(uint8_t saveOpt) {
}
}
void setGraphBuf(uint8_t *buff, size_t size) {
if (buff == NULL) return;
void setGraphBuf(const uint8_t *src, size_t size) {
if (src == NULL) return;
ClearGraph(false);
@ -81,14 +81,14 @@ void setGraphBuf(uint8_t *buff, size_t size) {
size = MAX_GRAPH_TRACE_LEN;
for (size_t i = 0; i < size; ++i)
g_GraphBuffer[i] = buff[i] - 128;
g_GraphBuffer[i] = src[i] - 128;
g_GraphTraceLen = size;
RepaintGraphWindow();
}
size_t getFromGraphBuf(uint8_t *buff) {
if (buff == NULL) return 0;
size_t getFromGraphBuf(uint8_t *dest) {
if (dest == NULL) return 0;
if (g_GraphTraceLen == 0) return 0;
size_t i;
@ -96,7 +96,7 @@ size_t getFromGraphBuf(uint8_t *buff) {
//trim
if (g_GraphBuffer[i] > 127) g_GraphBuffer[i] = 127;
if (g_GraphBuffer[i] < -127) g_GraphBuffer[i] = -127;
buff[i] = (uint8_t)(g_GraphBuffer[i] + 128);
dest[i] = (uint8_t)(g_GraphBuffer[i] + 128);
}
return i;
}

4
client/src/graph.h
View file

@ -20,9 +20,9 @@ extern "C" {
void AppendGraph(bool redraw, uint16_t clock, int bit);
size_t ClearGraph(bool redraw);
bool HasGraphData(void);
void setGraphBuf(uint8_t *buff, size_t size);
void setGraphBuf(const uint8_t *src, size_t size);
void save_restoreGB(uint8_t saveOpt);
size_t getFromGraphBuf(uint8_t *buff);
size_t getFromGraphBuf(uint8_t *dest);
void convertGraphFromBitstream(void);
void convertGraphFromBitstreamEx(int hi, int low);
bool isGraphBitstream(void);