gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

上传遗漏的changelog.sh文件

Browse Source
This commit is contained in:
liuxueli
2020-08-18 17:04:28 +08:00
committed by zhengchao
parent 0c694b5f98
commit 6b892eb103
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/changelog.sh Normal file
View File

@@ -0,0 +1,4 @@
#!/bin/sh
branch=`git status | grep branch | awk '{print $NF}'`
git log --branches=$branch --no-merges --date=local --show-signature --pretty="* %ad %an %ae %nhash: %H%ncommit:%n%B" | awk -F"-" '{print "- "$0}' | sed 's/- \*/\*/g' | sed 's/- $//g' | sed 's/-/ -/g' | sed 's/[0-9]\{2\}:[0-9]\{2\}:[0-9]\{2\}//g' > changelog.txt

2
src/entry/Maat_rule.cpp
View File

@@ -1931,7 +1931,7 @@ void update_intval_rule(struct Maat_table_schema* table, const char* table_line,
} }
break; break;
case TABLE_TYPE_INTERVAL_PLUS: case TABLE_TYPE_INTERVAL_PLUS:
ret=sscanf(table_line,"%d\t%d\t%s%u\t%u\t%d",&(intval_rule->region_id) ret=sscanf(table_line,"%d\t%d\t%s\t%u\t%u\t%d",&(intval_rule->region_id)
,&(intval_rule->group_id) ,&(intval_rule->group_id)
,intval_rule->district ,intval_rule->district
,&(intval_rule->intval.lb) ,&(intval_rule->intval.lb)