Proxmox-Port/libtpms
1
0
Fork 0
mirror of https://github.com/stefanberger/libtpms synced 2026-01-14 11:47:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add unsuppressable internal logging using ~0 indent

Browse Source 
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2017-11-11 10:43:14 -05:00
parent ae3f105ac3
commit 02db69c85a
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/tpm_library.c
View File

@ -45,6 +45,7 @@
#include <stdlib.h>
#include <stdarg.h>
#include <ctype.h>
#include <unistd.h>
#ifdef USE_FREEBL_CRYPTO_LIBRARY
# include <plbase64.h>
@ -421,24 +422,36 @@ int TPMLIB_LogPrintf(const char *format, ...)
/*
* TPMLIB_LogPrintfA: Printf to the logfd without indentation check
*
* @indent: how many spaces to indent; indent of ~0 forces logging
* with indent 0 even if not debug_level is set
* @format: format to use for formatting the following parameters
* @...: varargs
*/
void TPMLIB_LogPrintfA(unsigned int indent, const char *format, ...)
{
va_list args;
char spaces[20];
int fd;
if (!debug_fd || !debug_level)
return;
if (indent != ~0) {
if (!debug_fd || !debug_level)
return;
fd = debug_fd;
} else {
indent = 0;
fd = (debug_fd >= 0) ? debug_fd : STDERR_FILENO;
}
if (indent) {
if (indent > sizeof(spaces) - 1)
indent = sizeof(spaces) - 1;
memset(spaces, ' ', indent);
spaces[indent] = 0;
dprintf(debug_fd, "%s", spaces);
dprintf(fd, "%s", spaces);
}
va_start(args, format);
vdprintf(debug_fd, format, args);
vdprintf(fd, format, args);
va_end(args);
}

3
src/tpm_library_intern.h
View File

@ -80,4 +80,7 @@ TPM_RESULT TPM12_IO_TpmEstablished_Get(TPM_BOOL *tpmEstablished);
int TPMLIB_LogPrintf(const char *format, ...);
void TPMLIB_LogPrintfA(unsigned int indent, const char *format, ...);
#define TPMLIB_LogTPM12Error(format, ...) \
TPMLIB_LogPrintfA(~0, "libtpms/tpm12: "format, __VA_ARGS__)
#endif /* TPM_LIBRARY_INTERN_H */