H1K0-dev/tanabata
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf(lib): weeding also removes kazari with invalid sasa or tanzaku ID

Browse Source
This commit is contained in:
Masahiko AMANO 2022-12-30 18:09:50 +03:00
parent c7e38851f2
commit 94aa958471
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/database.c
View File

@ -65,19 +65,21 @@ int tanabata_weed(Tanabata *tanabata) {
tanabata->sasahyou.database = realloc(tanabata->sasahyou.database, tanabata->sasahyou.size * sizeof(Sasa)); tanabata->sasahyou.database = realloc(tanabata->sasahyou.database, tanabata->sasahyou.size * sizeof(Sasa));
tanabata->sasahyou.modified_ts = time(NULL); tanabata->sasahyou.modified_ts = time(NULL);
} }
if (tanabata->shoppyou.hole_cnt > 0) { hole_cnt = 0;
hole_cnt = 0; current_kazari = tanabata->shoppyou.database;
current_kazari = tanabata->shoppyou.database; for (uint64_t i = 0; i < tanabata->shoppyou.size; i++) {
for (uint64_t i = 0; i < tanabata->shoppyou.size; i++) { if (current_kazari->sasa_id != HOLE_ID && current_kazari->tanzaku_id != HOLE_ID &&
if (current_kazari->sasa_id != HOLE_ID && current_kazari->tanzaku_id != HOLE_ID) { current_kazari->sasa_id < tanabata->sasahyou.size &&
if (hole_cnt > 0) { current_kazari->tanzaku_id < tanabata->sappyou.size) {
*(current_kazari - hole_cnt) = *current_kazari; if (hole_cnt > 0) {
} *(current_kazari - hole_cnt) = *current_kazari;
} else {
hole_cnt++;
} }
current_kazari++; } else {
hole_cnt++;
} }
current_kazari++;
}
if (hole_cnt > 0) {
tanabata->shoppyou.size -= tanabata->shoppyou.hole_cnt; tanabata->shoppyou.size -= tanabata->shoppyou.hole_cnt;
tanabata->shoppyou.hole_cnt = 0; tanabata->shoppyou.hole_cnt = 0;
free(tanabata->shoppyou.holes); free(tanabata->shoppyou.holes);