From 742512e10f57bf2df171af77ce61170702eaa489 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Sat, 23 Apr 2022 18:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8E=E7=AC=94?= =?UTF-8?q?=E8=AF=AF=E5=B0=86Maat=5Fhierarchy=5Fclause=5Ffetch=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=B1=80=E9=83=A8=E5=8F=98=E9=87=8F=E7=9A=84=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E4=B8=BA=E9=9D=99=E6=80=81=E5=8F=98=E9=87=8F=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E3=80=82=20=E5=A4=9A=E4=B8=AAmaat=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=90=8C=E6=97=B6=E9=87=8D=E5=BB=BA=E5=B8=83=E5=B0=94?= =?UTF-8?q?=E8=A1=A8=E8=BE=BE=E5=BC=8F=E8=BF=90=E7=AE=97=E5=99=A8=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E8=AF=A5=E9=94=99=E8=AF=AF=E4=BC=9A=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E4=B8=8D=E5=AE=89=E5=85=A8=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E9=9D=99=E6=80=81=E5=8F=98=E9=87=8F=EF=BC=8C=E4=BD=86=E4=B8=8D?= =?UTF-8?q?=E5=BA=94=E5=AF=BC=E8=87=B4=20TSG-9741=20=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_hierarchy.cpp | 6 +++--- src/entry/Maat_rule.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/entry/Maat_hierarchy.cpp b/src/entry/Maat_hierarchy.cpp index 4f5282e..daecb19 100644 --- a/src/entry/Maat_hierarchy.cpp +++ b/src/entry/Maat_hierarchy.cpp @@ -238,9 +238,9 @@ static inline int compare_region_id(const void* a, const void* b) return ret; } -static struct Maat_hierarchy_clause* Maat_hierarchy_clause_fetch(struct Maat_hierarchy* hier, struct Maat_hierarchy_literal_id* literal_ids, size_t n_literal_id) +static const struct Maat_hierarchy_clause* Maat_hierarchy_clause_fetch(struct Maat_hierarchy* hier, struct Maat_hierarchy_literal_id* literal_ids, size_t n_literal_id) { - static struct Maat_hierarchy_clause* clause=NULL; + struct Maat_hierarchy_clause* clause=NULL; HASH_FIND(hh, hier->hash_dedup_clause_by_literals, literal_ids, n_literal_id*sizeof(struct Maat_hierarchy_literal_id), clause); @@ -927,7 +927,7 @@ static struct bool_matcher* Maat_hierarchy_build_bool_matcher(struct Maat_hierar struct Maat_hierarchy_compile* compile=NULL, *tmp_compile=NULL; struct Maat_hierarchy_clause_state* clause_state=NULL; - struct Maat_hierarchy_clause* clause=NULL; + const struct Maat_hierarchy_clause* clause=NULL; size_t i=0, j=0; int has_clause_num=0; compile_num=HASH_COUNT(hier->hash_compile_by_id); diff --git a/src/entry/Maat_rule.cpp b/src/entry/Maat_rule.cpp index 45e1266..29573c6 100644 --- a/src/entry/Maat_rule.cpp +++ b/src/entry/Maat_rule.cpp @@ -57,7 +57,7 @@ extern "C" } #endif -int MAAT_FRAME_VERSION_3_6_3_20220304=1; +int MAAT_FRAME_VERSION_3_6_4_20220423=1; int is_valid_table_name(const char* str) {