diff options
| author | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-01 21:18:03 -0700 |
|---|---|---|
| committer | Jeremy Huddleston <jeremyhu@apple.com> | 2011-06-01 21:57:52 -0700 |
| commit | 971193b2750b98b28597ba194ed388e79b3489b6 (patch) | |
| tree | febe426eb5442887c0814043af6e19b3f540b501 | |
| parent | 7dfd65705ccd3c6e2458d6892282520fe5ed8a6b (diff) | |
XQuartz: ASL: Use xpbproxy subsystem for logging xpbproxy messages
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
| -rw-r--r-- | hw/xquartz/pbproxy/app-main.m | 11 | ||||
| -rw-r--r-- | hw/xquartz/pbproxy/pbproxy.h | 15 |
2 files changed, 19 insertions, 7 deletions
diff --git a/hw/xquartz/pbproxy/app-main.m b/hw/xquartz/pbproxy/app-main.m index a8c3a6055..772c458a1 100644 --- a/hw/xquartz/pbproxy/app-main.m +++ b/hw/xquartz/pbproxy/app-main.m @@ -63,6 +63,17 @@ ErrorF(const char * f, ...) va_end(args); } +/* TODO: Have this actually log to ASL */ +void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...) { +#ifdef DEBUG + va_list args; + + va_start(args, fmt); + vfprintf(stderr, fmt, args); + va_end(args); +#endif +} + int main (int argc, const char *argv[]) { const char *s; int i; diff --git a/hw/xquartz/pbproxy/pbproxy.h b/hw/xquartz/pbproxy/pbproxy.h index fcbf4c4ba..c80a660cc 100644 --- a/hw/xquartz/pbproxy/pbproxy.h +++ b/hw/xquartz/pbproxy/pbproxy.h @@ -32,6 +32,8 @@ #import <Foundation/Foundation.h> +#include <asl.h> + #include <AvailabilityMacros.h> #if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 #if __LP64__ || NS_BUILD_32_LIKE_64 @@ -80,13 +82,12 @@ extern BOOL xpbproxy_input_register (void); /* os/log.c or app-main.m */ extern void ErrorF(const char *f, ...) _X_ATTRIBUTE_PRINTF(1,2); -#ifdef DEBUG -/* BEWARE: this can cause a string memory leak, according to the leaks program. */ -# define DebugF(msg, args...) ErrorF("%s:%s:%d " msg, __FILE__, __FUNCTION__, __LINE__, ##args) -#else -# define DebugF(...) /* */ -#endif +/* from darwin.h */ +_X_ATTRIBUTE_PRINTF(6,7) +extern void xq_asl_log (int level, const char *subsystem, const char *file, const char *function, int line, const char *fmt, ...); -#define TRACE() DebugF("TRACE\n") +#define ASL_LOG(level, subsystem, msg, args...) xq_asl_log(level, subsystem, __FILE__, __FUNCTION__, __LINE__, msg, ##args) +#define DebugF(msg, args...) ASL_LOG(ASL_LEVEL_DEBUG, "xpbproxy", msg, ##args) +#define TRACE() DebugF("TRACE") #endif /* PBPROXY_H */ |