StreetLight
/
libxkbcommon
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove old logging leftovers 

Everything has been converted.

Signed-off-by: Ran Benita <ran234@gmail.com>
master
Ran Benita 2012-07-21 16:10:17 +03:00
parent 70e3e7e5c3
commit 2c30fa7a60
4 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/context.c
View File

@ -202,7 +202,7 @@ priority_to_prefix(int priority)
case LOG_EMERG: case LOG_EMERG:
return "Internal error:"; return "Internal error:";
default: default:
return ""; return NULL;
} }
} }
@ -316,11 +316,7 @@ xkb_log(struct xkb_context *ctx, int priority, const char *fmt, ...)
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
/* NOTE: This test will be removed in a few commits. */
if (ctx)
ctx->log_fn(ctx, priority, fmt, args); ctx->log_fn(ctx, priority, fmt, args);
else
default_log_fn(ctx, priority, fmt, args);
va_end(args); va_end(args);
} }

6
src/utils.h
View File

@ -68,10 +68,4 @@
#define ATTR_MALLOC #define ATTR_MALLOC
#endif #endif
#define INFO(...) xkb_log(NULL, LOG_INFO, __VA_ARGS__)
#define WARN(...) xkb_log(NULL, LOG_WARNING, __VA_ARGS__)
#define ERROR(...) xkb_log(NULL, LOG_ERR, __VA_ARGS__)
#define WSGO(...) xkb_log(NULL, LOG_CRIT, __VA_ARGS__)
#define ACTION(...) xkb_log(NULL, -1, __VA_ARGS__)
#endif /* UTILS_H */ #endif /* UTILS_H */

3
src/xkbcomp/xkbcomp.c
View File

@ -28,9 +28,6 @@
#include "rules.h" #include "rules.h"
#include "parseutils.h" #include "parseutils.h"
/* Global warning level */
unsigned int warningLevel = 0;
#define ISEMPTY(str) (!(str) || (strlen(str) == 0)) #define ISEMPTY(str) (!(str) || (strlen(str) == 0))
static XkbFile * static XkbFile *

2
src/xkbcomp/xkbcomp.h
View File

@ -87,8 +87,6 @@ enum merge_mode {
#define AutoKeyNames (1L << 0) #define AutoKeyNames (1L << 0)
#define CreateKeyNames(x) ((x)->flags & AutoKeyNames) #define CreateKeyNames(x) ((x)->flags & AutoKeyNames)
extern unsigned warningLevel;
typedef struct _IncludeStmt { typedef struct _IncludeStmt {
ParseCommon common; ParseCommon common;
enum merge_mode merge; enum merge_mode merge;