7:59 a.m.
Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com>
---
include/qb/qblog.h | 4 ++--
lib/log.c | 18 +++++++++---------
lib/log_dcs.c | 2 +-
lib/log_int.h | 2 +-
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/include/qb/qblog.h b/include/qb/qblog.h
index b5da37d..03c4184 100644
--- a/include/qb/qblog.h
+++ b/include/qb/qblog.h
@@ -365,7 +365,7 @@ enum qb_log_filter_conf {
*/
void qb_log_init(const char *name,
int32_t facility,
- int32_t priority);
+ uint8_t priority);
/**
* Logging system finalization function.
@@ -411,7 +411,7 @@ int32_t qb_log_ctl(int32_t t, enum qb_log_conf c, int32_t arg);
*/
int32_t qb_log_filter_ctl(int32_t value, enum qb_log_filter_conf c,
enum qb_log_filter_type type, const char * text,
- uint32_t priority);
+ uint8_t priority);
/**
* Set the callback to map the 'tags' bit map to a string.
diff --git a/lib/log.c b/lib/log.c
index 6975dd6..52712c5 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -51,11 +51,11 @@ static void _log_target_disable(struct qb_log_target *t);
static void _log_filter_apply(struct callsite_section *sect,
uint32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority);
+ const char *text, uint8_t priority);
static void _log_filter_apply_to_cs(struct qb_log_callsite *cs,
uint32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority);
+ const char *text, uint8_t priority);
/* deprecated method of getting internal log messages */
static qb_util_log_fn_t old_internal_log_fn = NULL;
@@ -67,7 +67,7 @@ void qb_util_set_log_function(qb_util_log_fn_t fn)
static int32_t _cs_matches_filter_(struct qb_log_callsite *cs,
enum qb_log_filter_type type,
const char * text,
- uint32_t priority)
+ uint8_t priority)
{
int32_t match = QB_FALSE;
@@ -272,7 +272,7 @@ void qb_log_callsites_dump(void)
static int32_t _log_filter_exists(struct qb_list_head *list_head,
enum qb_log_filter_type type,
- const char *text, uint32_t priority,
+ const char *text, uint8_t priority,
uint32_t new_value)
{
struct qb_log_filter *flt;
@@ -290,7 +290,7 @@ static int32_t _log_filter_exists(struct qb_list_head *list_head,
static int32_t _log_filter_store(uint32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority)
+ const char *text, uint8_t priority)
{
struct qb_log_filter *flt;
struct qb_list_head *iter;
@@ -357,7 +357,7 @@ static int32_t _log_filter_store(uint32_t t, enum qb_log_filter_conf
c,
static void _log_filter_apply(struct callsite_section *sect,
uint32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority)
+ const char *text, uint8_t priority)
{
struct qb_log_callsite *cs;
@@ -373,7 +373,7 @@ static void _log_filter_apply(struct callsite_section *sect,
static void _log_filter_apply_to_cs(struct qb_log_callsite *cs,
uint32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority)
+ const char *text, uint8_t priority)
{
if (c == QB_LOG_FILTER_CLEAR_ALL) {
@@ -415,7 +415,7 @@ static void _log_filter_apply_to_cs(struct qb_log_callsite *cs,
int32_t qb_log_filter_ctl(int32_t t, enum qb_log_filter_conf c,
enum qb_log_filter_type type,
- const char *text, uint32_t priority)
+ const char *text, uint8_t priority)
{
struct callsite_section *sect;
int32_t rc;
@@ -484,7 +484,7 @@ done:
}
#endif /* QB_HAVE_ATTRIBUTE_SECTION */
-void qb_log_init(const char *name, int32_t facility, int32_t priority)
+void qb_log_init(const char *name, int32_t facility, uint8_t priority)
{
int32_t i;
diff --git a/lib/log_dcs.c b/lib/log_dcs.c
index 14a8e11..4dd49e9 100644
--- a/lib/log_dcs.c
+++ b/lib/log_dcs.c
@@ -119,7 +119,7 @@ qb_log_dcs_get(int32_t *newly_created,
}
if (csl_head->cs == NULL) {
csl_head->cs = _log_dcs_new_cs(function, filename, format,
- priority, lineno, tags);
+ priority, lineno, tags);
cs = csl_head->cs;
qb_list_init(&csl_head->list);
*newly_created = QB_TRUE;
diff --git a/lib/log_int.h b/lib/log_int.h
index e73d5d0..6bbf06e 100644
--- a/lib/log_int.h
+++ b/lib/log_int.h
@@ -65,7 +65,7 @@ struct qb_log_filter {
enum qb_log_filter_conf conf;
enum qb_log_filter_type type;
char *text;
- int32_t priority;
+ uint8_t priority;
uint32_t new_value;
struct qb_list_head list;
};
--
1.7.4