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

simplify PrintAndLogEx()

Browse source
This commit is contained in:
Brian Pow 2018-02-21 14:10:44 +08:00
commit 68fddf00ce
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
client/ui.c
View file

@ -22,21 +22,17 @@ bool showDemod = true;
pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER; pthread_mutex_t print_lock = PTHREAD_MUTEX_INITIALIZER;
static char *logfilename = "proxmark3.log"; static char *logfilename = "proxmark3.log";
void PrintAndLogEx(logLevel_t level, char *filename, int lineno, char *func, char *fmt, ...) { void PrintAndLogEx(logLevel_t level, char *fmt, ...) {
char buffer[MAX_PRINT_BUFFER] = {0}; char buffer[MAX_PRINT_BUFFER] = {0};
int size; int size;
static char *prefix[5]; static char *prefix[7] = { "", "[+] ", "[=] ", "[-] ", "[!] ", "[!!] ", "[#] "};
prefix[0]="";
prefix[1]=" [+] ";
prefix[2]=" [!] ";
prefix[3]=" [!!] ";
prefix[4]=" [#] ";
size=strlen(prefix[level]); size=strlen(prefix[level]);
strncpy(buffer, prefix[level], MAX_PRINT_BUFFER); strncpy(buffer, prefix[level], sizeof buffer);
va_list args; va_list args;
va_start(args,fmt); va_start(args,fmt);
vsprintf(buffer + size,fmt, args); vsnprintf(buffer + size, sizeof(buffer) - size, fmt, args);
va_end(args); va_end(args);
PrintAndLog(buffer); PrintAndLog(buffer);
} }

4
client/ui.h
View file

@ -29,14 +29,14 @@
#define M_PI 3.14159265358979323846264338327 #define M_PI 3.14159265358979323846264338327
#endif #endif
#define MAX_PRINT_BUFFER 2048 #define MAX_PRINT_BUFFER 2048
typedef enum logLevel {NORMAL, INFO, WARNING, ERR, DEBUG} logLevel_t; typedef enum logLevel {NORMAL, SUCCESS, INFO, FAILED, WARNING, ERR, DEBUG} logLevel_t;
void ShowGui(void); void ShowGui(void);
void HideGraphWindow(void); void HideGraphWindow(void);
void ShowGraphWindow(void); void ShowGraphWindow(void);
void RepaintGraphWindow(void); void RepaintGraphWindow(void);
extern void PrintAndLog(char *fmt, ...); extern void PrintAndLog(char *fmt, ...);
void PrintAndLogEx(logLevel_t level, char *filename, int lineno, char *func, char *fmt, ...); void PrintAndLogEx(logLevel_t level, char *fmt, ...);
extern void SetLogFilename(char *fn); extern void SetLogFilename(char *fn);
extern double CursorScaleFactor; extern double CursorScaleFactor;