mirror of
https://github.com/Maschell/libutils.git
synced 2025-01-28 11:05:29 +01:00
Added function to "log" via OSFatal
This commit is contained in:
parent
b1d95f6b83
commit
8e3a2f337a
@ -53,6 +53,16 @@ void log_print_(const char *str){
|
|||||||
log_lock = 0;
|
log_lock = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OSFatal_printf(const char *format, ...){
|
||||||
|
char * tmp = NULL;
|
||||||
|
va_list va;
|
||||||
|
va_start(va, format);
|
||||||
|
if((vasprintf(&tmp, format, va) >= 0) && tmp){
|
||||||
|
OSFatal(tmp);
|
||||||
|
}
|
||||||
|
va_end(va);
|
||||||
|
}
|
||||||
|
|
||||||
void log_printf_(const char *format, ...)
|
void log_printf_(const char *format, ...)
|
||||||
{
|
{
|
||||||
if(log_socket < 0) {
|
if(log_socket < 0) {
|
||||||
|
@ -11,6 +11,14 @@ void log_init_();
|
|||||||
//void log_deinit_(void);
|
//void log_deinit_(void);
|
||||||
void log_print_(const char *str);
|
void log_print_(const char *str);
|
||||||
void log_printf_(const char *format, ...);
|
void log_printf_(const char *format, ...);
|
||||||
|
void OSFatal_printf(const char *format, ...);
|
||||||
|
|
||||||
|
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
|
||||||
|
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
|
||||||
|
|
||||||
|
#define OSFATAL_FUNCTION_LINE(FMT, ARGS...)do { \
|
||||||
|
OSFatal_printf("[%s]%s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
||||||
|
} while (0)
|
||||||
|
|
||||||
#ifdef __LOGGING__
|
#ifdef __LOGGING__
|
||||||
|
|
||||||
@ -19,13 +27,11 @@ void log_printf_(const char *format, ...);
|
|||||||
#define log_print(str) log_print_(str)
|
#define log_print(str) log_print_(str)
|
||||||
#define log_printf(FMT, ARGS...) log_printf_(FMT, ## ARGS);
|
#define log_printf(FMT, ARGS...) log_printf_(FMT, ## ARGS);
|
||||||
|
|
||||||
#define __FILENAME_X__ (strrchr(__FILE__, '\\') ? strrchr(__FILE__, '\\') + 1 : __FILE__)
|
|
||||||
#define __FILENAME__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILENAME_X__)
|
|
||||||
|
|
||||||
#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
|
#define DEBUG_FUNCTION_LINE(FMT, ARGS...)do { \
|
||||||
log_printf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
log_printf("[%23s]%30s@L%04d: " FMT "",__FILENAME__,__FUNCTION__, __LINE__, ## ARGS); \
|
||||||
} while (0)
|
} while (0)
|
||||||
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define log_init()
|
#define log_init()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user