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

migrate PrintfAndLog() to PrintAndLogDevice()

Browse source
This commit is contained in:
Brian Pow 2018-02-22 22:59:55 +08:00
commit a4fa0144eb
8 changed files with 107 additions and 105 deletions
Download patch file Download diff file Expand all files Collapse all files

18
client/loclass/fileutils.c
View file

@ -77,14 +77,14 @@ int saveFile(const char *preferredName, const char *suffix, const void* data, si
/*Opening file for writing in binary mode*/
FILE *f = fopen(fileName, "wb");
if (!f) {
PrintfAndLog("[!] file not found or locked. '%s'", fileName);
PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
free(fileName);
return 1;
}
fwrite(data, 1, datalen, f);
fflush(f);
fclose(f);
PrintfAndLog("[+] saved %u bytes to binary file %s", datalen, fileName);
PrintAndLogDevice(SUCCESS, "saved %u bytes to binary file %s", datalen, fileName);
free(fileName);
return 0;
}
@ -113,7 +113,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
/*Opening file for writing in text mode*/
FILE *f = fopen(fileName, "w+");
if (!f) {
PrintfAndLog("[!] file not found or locked. '%s'", fileName);
PrintAndLogDevice(WARNING, "file not found or locked. '%s'", fileName);
retval = 1;
goto out;
}
@ -132,7 +132,7 @@ int saveFileEML(const char *preferredName, const char *suffix, uint8_t* data, si
}
fflush(f);
fclose(f);
PrintfAndLog("[+] saved %d blocks to text file %s", blocks, fileName);
PrintAndLogDevice(SUCCESS, "saved %d blocks to text file %s", blocks, fileName);
out:
free(fileName);
@ -147,17 +147,17 @@ out:
* write also to a logfile. When doing so, just delete this function.
* @param fmt
*/
void PrintfAndLog(char *fmt, ...)
void PrintAndLogDevice(logLevel_t level, char *fmt, ...)
{
char buffer[2048] = {0};
va_list args;
va_start(args,fmt);
vsprintf (buffer,fmt, args);
va_start(args, fmt);
vsnprintf(buffer, sizeof(buffer), fmt, args);
va_end(args);
PrintAndLog(buffer);
PrintAndLogEx(level, buffer);
}
#else //if we're on ARM
void PrintfAndLog(char *fmt,...)
void PrintAndLogDevice(logLevel_t level, char *fmt,...)
{
return;
}