git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DiskTool - Autodetection of filesystems and better debugging
[tpg/acess2.git]
/
Tools
/
DiskTool
/
src
/
logging.c
diff --git
a/Tools/DiskTool/src/logging.c
b/Tools/DiskTool/src/logging.c
index
3a0d9f1
..
2b03c6f
100644
(file)
--- a/
Tools/DiskTool/src/logging.c
+++ b/
Tools/DiskTool/src/logging.c
@@
-7,6
+7,7
@@
#include <stdint.h>
#include <acess_logging.h>
#include <ctype.h>
#include <stdint.h>
#include <acess_logging.h>
#include <ctype.h>
+#include <inttypes.h>
#define LOGHDR(col,type) fprintf(stderr, "\e["col"m[%-8.8s]"type" ", Ident)
#define LOGTAIL() fprintf(stderr, "\e[0m\n")
#define LOGHDR(col,type) fprintf(stderr, "\e["col"m[%-8.8s]"type" ", Ident)
#define LOGTAIL() fprintf(stderr, "\e[0m\n")
@@
-22,7
+23,7
@@
// === CODE ===
void Log_KernelPanic(const char *Ident, const char *Message, ...) {
PUTERR("35", "k")
// === CODE ===
void Log_KernelPanic(const char *Ident, const char *Message, ...) {
PUTERR("35", "k")
-
exit(-1
);
+
abort(
);
}
void Log_Panic(const char *Ident, const char *Message, ...)
PUTERR("34", "p")
}
void Log_Panic(const char *Ident, const char *Message, ...)
PUTERR("34", "p")
@@
-116,6
+117,9
@@
void Debug_TraceEnter(const char *Function, const char *Format, ...)
case 'x':
fprintf(stderr, "0x%x", va_arg(args,unsigned int));
break;
case 'x':
fprintf(stderr, "0x%x", va_arg(args,unsigned int));
break;
+ case 'X':
+ fprintf(stderr, "0x%"PRIx64, va_arg(args,uint64_t));
+ break;
default:
va_arg(args,uintptr_t);
fprintf(stderr, "?");
default:
va_arg(args,uintptr_t);
fprintf(stderr, "?");
@@
-174,9
+178,18
@@
void Debug_TraceLeave(const char *Function, char Type, ...)
case 'i':
fprintf(stderr, " %i", va_arg(args, int));
break;
case 'i':
fprintf(stderr, " %i", va_arg(args, int));
break;
- case 'p':
+ case 'x':
+ fprintf(stderr, " 0x%x", va_arg(args, unsigned int));
+ break;
+ case 'X':
+ fprintf(stderr, " 0x%"PRIx64, va_arg(args,uint64_t));
+ break;
+ case 's':
fprintf(stderr, " \"%s\"", va_arg(args, const char *));
break;
fprintf(stderr, " \"%s\"", va_arg(args, const char *));
break;
+ case 'p':
+ fprintf(stderr, " %p", va_arg(args, const void *));
+ break;
default:
fprintf(stderr, " ?");
break;
default:
fprintf(stderr, " ?");
break;
UCC
git Repository :: git.ucc.asn.au