Everything has been converted.
Signed-off-by: Ran Benita <ran234@gmail.com>
case LOG_EMERG:
return "Internal error:";
default:
- return "";
+ return NULL;
}
}
va_list args;
va_start(args, fmt);
- /* NOTE: This test will be removed in a few commits. */
- if (ctx)
- ctx->log_fn(ctx, priority, fmt, args);
- else
- default_log_fn(ctx, priority, fmt, args);
+ ctx->log_fn(ctx, priority, fmt, args);
va_end(args);
}
#define ATTR_MALLOC
#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 */
#include "rules.h"
#include "parseutils.h"
-/* Global warning level */
-unsigned int warningLevel = 0;
-
#define ISEMPTY(str) (!(str) || (strlen(str) == 0))
static XkbFile *
#define AutoKeyNames (1L << 0)
#define CreateKeyNames(x) ((x)->flags & AutoKeyNames)
-extern unsigned warningLevel;
-
typedef struct _IncludeStmt {
ParseCommon common;
enum merge_mode merge;