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

FIX: time printing, like difftime in MINGW enviroments needs to use 32b time.

Browse source
This commit is contained in:
iceman1001 2016-04-23 13:02:20 +02:00
commit be6e909c5b
5 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/cmdhfmf.c
View file

@ -1230,9 +1230,9 @@ int CmdHF14AMfChk(const char *Cmd) {
t1 = clock() - t1; t1 = clock() - t1;
time(&end); time(&end);
unsigned long elapsed_time = difftime(end, start); unsigned long elapsed_time = difftime(end, start);
if ( t1 > 0 ) if ( t1 > 0 )
printf("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time); PrintAndLog("\nTime in checkkeys: %.0f ticks %u seconds\n", (float)t1, elapsed_time);
// 20160116 If Sector A is found, but not Sector B, try just reading it of the tag? // 20160116 If Sector A is found, but not Sector B, try just reading it of the tag?
if ( keyType != 1 ) { if ( keyType != 1 ) {

4
client/proxmark3.h
View file

@ -12,6 +12,10 @@
#ifndef PROXMARK3_H__ #ifndef PROXMARK3_H__
#define PROXMARK3_H__ #define PROXMARK3_H__
#ifdef __WIN32
// for MINGW32 environments
#define _USE_32BIT_TIME_T 1
#endif
#define __STDC_FORMAT_MACROS 1 #define __STDC_FORMAT_MACROS 1
#include <inttypes.h> #include <inttypes.h>
#define lx PRIx32 #define lx PRIx32

1
client/uart.h
View file

@ -37,7 +37,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>

1
client/ui.h
View file

@ -10,6 +10,7 @@
#ifndef UI_H__ #ifndef UI_H__
#define UI_H__ #define UI_H__
#define _USE_MATH_DEFINES #define _USE_MATH_DEFINES
#include <stdarg.h> #include <stdarg.h>
#include <stdlib.h> #include <stdlib.h>