Allow externalisation of PrintAndLog

This commit is contained in:
Michael Farrell 2017-12-03 14:04:33 +11:00
commit e3039d63fb

View file

@ -9,12 +9,14 @@
// UI utilities // UI utilities
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#include <stdarg.h> #include <stdbool.h>
#ifndef EXTERNAL_PRINTANDLOG
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h> #include <stdarg.h>
#include <readline/readline.h> #include <readline/readline.h>
#include <pthread.h> #include <pthread.h>
#endif
#include "ui.h" #include "ui.h"
@ -26,10 +28,12 @@ int GridOffset = 0;
bool GridLocked = false; bool GridLocked = false;
bool showDemod = true; bool showDemod = true;
extern pthread_mutex_t print_lock;
static char *logfilename = "proxmark3.log"; static char *logfilename = "proxmark3.log";
#ifndef EXTERNAL_PRINTANDLOG
// Declared in proxmark3.c
extern pthread_mutex_t print_lock;
void PrintAndLog(char *fmt, ...) void PrintAndLog(char *fmt, ...)
{ {
char *saved_line; char *saved_line;
@ -94,7 +98,7 @@ void PrintAndLog(char *fmt, ...)
//release lock //release lock
pthread_mutex_unlock(&print_lock); pthread_mutex_unlock(&print_lock);
} }
#endif
void SetLogFilename(char *fn) void SetLogFilename(char *fn)
{ {