Low: log: return filter type enum to preserve abi compatibilty with c…

…orosync This returns abi compatiblity with libqb v0.16.0. There was a subtle change in behavior caused by reordering the log filter enum in v0.17.0.
ClusterLabs · Jul 23, 2014 · 073f927 · 073f927
1 parent bd48e8f
commit 073f927
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/include/qb/qblog.h b/include/qb/qblog.h
@@ -408,12 +408,12 @@ enum qb_log_conf {
 };
 
 enum qb_log_filter_type {
-	QB_LOG_FILTER_FILE_REGEX,
-	QB_LOG_FILTER_FUNCTION_REGEX,
-	QB_LOG_FILTER_FORMAT_REGEX,
 	QB_LOG_FILTER_FILE,
 	QB_LOG_FILTER_FUNCTION,
 	QB_LOG_FILTER_FORMAT,
+	QB_LOG_FILTER_FILE_REGEX,
+	QB_LOG_FILTER_FUNCTION_REGEX,
+	QB_LOG_FILTER_FORMAT_REGEX,
 };
 
 enum qb_log_filter_conf {

diff --git a/lib/log.c b/lib/log.c
@@ -683,7 +683,7 @@ qb_log_filter_ctl2(int32_t t, enum qb_log_filter_conf c,
 
 	if (text == NULL ||
 	    low_priority < high_priority ||
-	    type > QB_LOG_FILTER_FORMAT ||
+	    type > QB_LOG_FILTER_FORMAT_REGEX ||
 	    c > QB_LOG_TAG_CLEAR_ALL) {
 		return -EINVAL;
 	}