From 460831ea23176e91f709721e16d5e906f66b6703 Mon Sep 17 00:00:00 2001 From: zhengchao Date: Mon, 8 Mar 2021 18:59:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86expr=5Fplus=E4=B8=AD=E7=9A=84?= =?UTF-8?q?district=E6=97=B6=EF=BC=8C=E4=BD=BF=E7=94=A8=E4=BA=86memmove?= =?UTF-8?q?=EF=BC=8C=E5=BD=93=E5=91=BD=E4=B8=ADregion=E8=BE=83=E5=A4=9A?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=BE=E8=91=97=E5=BD=B1=E5=93=8D=E6=80=A7?= =?UTF-8?q?=E8=83=BD=E3=80=82=20#25?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entry/Maat_api.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/entry/Maat_api.cpp b/src/entry/Maat_api.cpp index 1880041..909ddad 100644 --- a/src/entry/Maat_api.cpp +++ b/src/entry/Maat_api.cpp @@ -280,23 +280,17 @@ int region_compile(_Maat_feather_t*feather, struct Maat_hierarchy_compile_mid* c int match_district(struct _OUTER_scan_status_t *_mid, scan_result_t *region_hit, int region_hit_num) { struct Maat_region_inner* region=NULL; - int i=0; - int ret_region_num=region_hit_num; - while(idistrict_id!=_mid->district_id) + if(region->district_id==_mid->district_id) { - ret_region_num--; - //todo: replace memmove with high performance solution. - memmove(&(region_hit[i]),&(region_hit[i+1]),sizeof(scan_result_t)*(ret_region_num-i)); - } - else - { - i++; + memcpy(region_hit+j, region_hit+i, sizeof(scan_result_t)); + j++; } } - return ret_region_num; + return j; }