From cd9dddc6cd370c42ec9306d6f2aad276dc48ed00 Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Fri, 23 Dec 2022 14:29:33 +0300 Subject: [PATCH] refactor(core): rename "content" field to "database" --- include/core.h | 6 ++-- src/core/sappyou.c | 68 ++++++++++++++++++++++----------------------- src/core/sasahyou.c | 44 ++++++++++++++--------------- src/core/shoppyou.c | 30 ++++++++++---------- 4 files changed, 74 insertions(+), 74 deletions(-) diff --git a/include/core.h b/include/core.h index 133c016..7038b13 100644 --- a/include/core.h +++ b/include/core.h @@ -44,7 +44,7 @@ typedef struct sasahyou { uint64_t created_ts; // Sasahyou creation timestamp uint64_t modified_ts; // Sasahyou last modification timestamp uint64_t size; // Sasahyou size (including holes) - Sasa *content; // Array of sasa + Sasa *database; // Array of sasa uint64_t hole_cnt; // Number of holes Sasa **holes; // Array of pointers to holes FILE *file; // Storage file for sasahyou @@ -55,7 +55,7 @@ typedef struct sappyou { uint64_t created_ts; // Sappyou creation timestamp uint64_t modified_ts; // Sappyou last modification timestamp uint64_t size; // Sappyou size (including holes) - Tanzaku *content; // Array of tanzaku + Tanzaku *database; // Array of tanzaku uint64_t hole_cnt; // Number of holes Tanzaku **holes; // Array of pointers to holes FILE *file; // Storage file for sappyou @@ -66,7 +66,7 @@ typedef struct shoppyou { uint64_t created_ts; // Shoppyou creation timestamp uint64_t modified_ts; // Shoppyou last modification timestamp uint64_t size; // Shoppyou size (including holes) - Kazari *content; // Array of kazari + Kazari *database; // Array of kazari uint64_t hole_cnt; // Number of holes Kazari **holes; // Array of pointers to holes FILE *file; // Storage file for shoppyou diff --git a/src/core/sappyou.c b/src/core/sappyou.c index 49b727a..753ba97 100644 --- a/src/core/sappyou.c +++ b/src/core/sappyou.c @@ -11,7 +11,7 @@ int sappyou_init(Sappyou *sappyou) { sappyou->created_ts = time(NULL); sappyou->modified_ts = sappyou->created_ts; sappyou->size = 0; - sappyou->content = NULL; + sappyou->database = NULL; sappyou->hole_cnt = 0; sappyou->holes = NULL; sappyou->file = NULL; @@ -20,11 +20,11 @@ int sappyou_init(Sappyou *sappyou) { int sappyou_free(Sappyou *sappyou) { for (uint64_t i = 0; i < sappyou->size; i++) { - free(sappyou->content[i].name); - free(sappyou->content[i].alias); - free(sappyou->content[i].description); + free(sappyou->database[i].name); + free(sappyou->database[i].alias); + free(sappyou->database[i].description); } - free(sappyou->content); + free(sappyou->database); if (sappyou->file != NULL) { fclose(sappyou->file); } @@ -47,21 +47,21 @@ int sappyou_load(Sappyou *sappyou) { fread(&sappyou->modified_ts, 8, 1, sappyou->file); fread(&sappyou->size, 8, 1, sappyou->file); fread(&sappyou->hole_cnt, 8, 1, sappyou->file); - sappyou->content = malloc(sappyou->size * sizeof(Tanzaku)); + sappyou->database = malloc(sappyou->size * sizeof(Tanzaku)); sappyou->holes = malloc(sappyou->hole_cnt * sizeof(Tanzaku *)); size_t max_string_len = SIZE_MAX; for (uint64_t i = 0, r = sappyou->hole_cnt; i < sappyou->size; i++) { if (fgetc(sappyou->file) != 0) { - sappyou->content[i].id = i; - fread(&sappyou->content[i].created_ts, 8, 1, sappyou->file); - fread(&sappyou->content[i].modified_ts, 8, 1, sappyou->file); - getdelim(&sappyou->content[i].name, &max_string_len, 0, sappyou->file); - getdelim(&sappyou->content[i].alias, &max_string_len, 0, sappyou->file); - getdelim(&sappyou->content[i].description, &max_string_len, 0, sappyou->file); + sappyou->database[i].id = i; + fread(&sappyou->database[i].created_ts, 8, 1, sappyou->file); + fread(&sappyou->database[i].modified_ts, 8, 1, sappyou->file); + getdelim(&sappyou->database[i].name, &max_string_len, 0, sappyou->file); + getdelim(&sappyou->database[i].alias, &max_string_len, 0, sappyou->file); + getdelim(&sappyou->database[i].description, &max_string_len, 0, sappyou->file); } else { - sappyou->content[i].id = HOLE_ID; + sappyou->database[i].id = HOLE_ID; r--; - sappyou->holes[r] = sappyou->content + i; + sappyou->holes[r] = sappyou->database + i; } } return 0; @@ -80,15 +80,15 @@ int sappyou_save(Sappyou *sappyou) { fwrite(&sappyou->hole_cnt, 8, 1, sappyou->file); fflush(sappyou->file); for (uint64_t i = 0; i < sappyou->size; i++) { - if (sappyou->content[i].id != HOLE_ID) { + if (sappyou->database[i].id != HOLE_ID) { fputc(-1, sappyou->file); - fwrite(&sappyou->content[i].created_ts, 8, 1, sappyou->file); - fwrite(&sappyou->content[i].modified_ts, 8, 1, sappyou->file); - fputs(sappyou->content[i].name, sappyou->file); + fwrite(&sappyou->database[i].created_ts, 8, 1, sappyou->file); + fwrite(&sappyou->database[i].modified_ts, 8, 1, sappyou->file); + fputs(sappyou->database[i].name, sappyou->file); fputc(0, sappyou->file); - fputs(sappyou->content[i].alias, sappyou->file); + fputs(sappyou->database[i].alias, sappyou->file); fputc(0, sappyou->file); - fputs(sappyou->content[i].description, sappyou->file); + fputs(sappyou->database[i].description, sappyou->file); fputc(0, sappyou->file); } else { fputc(0, sappyou->file); @@ -139,14 +139,14 @@ int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const cha if (sappyou->hole_cnt > 0) { sappyou->hole_cnt--; Tanzaku **hole_ptr = sappyou->holes + sappyou->hole_cnt; - newbie.id = *hole_ptr - sappyou->content; + newbie.id = *hole_ptr - sappyou->database; **hole_ptr = newbie; sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); } else { newbie.id = sappyou->size; sappyou->size++; - sappyou->content = realloc(sappyou->content, sappyou->size * sizeof(Tanzaku)); - sappyou->content[newbie.id] = newbie; + sappyou->database = realloc(sappyou->database, sappyou->size * sizeof(Tanzaku)); + sappyou->database[newbie.id] = newbie; } sappyou->modified_ts = newbie.created_ts; return 0; @@ -161,26 +161,26 @@ int tanzaku_rem_by_id(Sappyou *sappyou, uint64_t tanzaku_id) { fprintf(stderr, "Failed to remove tanzaku: target tanzaku does not exist\n"); return 1; } - if (sappyou->content[tanzaku_id].id == HOLE_ID) { + if (sappyou->database[tanzaku_id].id == HOLE_ID) { fprintf(stderr, "Failed to remove tanzaku: target tanzaku is already removed\n"); return 1; } - sappyou->content[tanzaku_id].id = HOLE_ID; + sappyou->database[tanzaku_id].id = HOLE_ID; sappyou->hole_cnt++; sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt); - sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + tanzaku_id; + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->database + tanzaku_id; sappyou->modified_ts = time(NULL); return 0; } int tanzaku_rem_by_name(Sappyou *sappyou, const char *name) { for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->content[i].name, name) == 0) { - if (sappyou->content[i].id != HOLE_ID) { - sappyou->content[i].id = HOLE_ID; + if (strcmp(sappyou->database[i].name, name) == 0) { + if (sappyou->database[i].id != HOLE_ID) { + sappyou->database[i].id = HOLE_ID; sappyou->hole_cnt++; sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); - sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + i; + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->database + i; sappyou->modified_ts = time(NULL); return 0; } else { @@ -195,12 +195,12 @@ int tanzaku_rem_by_name(Sappyou *sappyou, const char *name) { int tanzaku_rem_by_alias(Sappyou *sappyou, const char *alias) { for (uint64_t i = 0; i < sappyou->size; i++) { - if (strcmp(sappyou->content[i].alias, alias) == 0) { - if (sappyou->content[i].id != HOLE_ID) { - sappyou->content[i].id = HOLE_ID; + if (strcmp(sappyou->database[i].alias, alias) == 0) { + if (sappyou->database[i].id != HOLE_ID) { + sappyou->database[i].id = HOLE_ID; sappyou->hole_cnt++; sappyou->holes = realloc(sappyou->holes, sappyou->hole_cnt * sizeof(Tanzaku *)); - sappyou->holes[sappyou->hole_cnt - 1] = sappyou->content + i; + sappyou->holes[sappyou->hole_cnt - 1] = sappyou->database + i; sappyou->modified_ts = time(NULL); return 0; } else { diff --git a/src/core/sasahyou.c b/src/core/sasahyou.c index c7c3a07..01d994f 100644 --- a/src/core/sasahyou.c +++ b/src/core/sasahyou.c @@ -12,7 +12,7 @@ int sasahyou_init(Sasahyou *sasahyou) { sasahyou->created_ts = time(NULL); sasahyou->modified_ts = sasahyou->created_ts; sasahyou->size = 0; - sasahyou->content = NULL; + sasahyou->database = NULL; sasahyou->hole_cnt = 0; sasahyou->holes = NULL; sasahyou->file = NULL; @@ -21,9 +21,9 @@ int sasahyou_init(Sasahyou *sasahyou) { int sasahyou_free(Sasahyou *sasahyou) { for (uint64_t i = 0; i < sasahyou->size; i++) { - free(sasahyou->content[i].path); + free(sasahyou->database[i].path); } - free(sasahyou->content); + free(sasahyou->database); free(sasahyou->holes); if (sasahyou->file != NULL) { fclose(sasahyou->file); @@ -47,18 +47,18 @@ int sasahyou_load(Sasahyou *sasahyou) { fread(&sasahyou->modified_ts, 8, 1, sasahyou->file); fread(&sasahyou->size, 8, 1, sasahyou->file); fread(&sasahyou->hole_cnt, 8, 1, sasahyou->file); - sasahyou->content = malloc(sasahyou->size * sizeof(Sasa)); + sasahyou->database = malloc(sasahyou->size * sizeof(Sasa)); sasahyou->holes = malloc(sasahyou->hole_cnt * sizeof(Sasa *)); size_t max_path_len = SIZE_MAX; for (uint64_t i = 0, r = sasahyou->hole_cnt; i < sasahyou->size; i++) { if (fgetc(sasahyou->file) != 0) { - sasahyou->content[i].id = i; - fread(&sasahyou->content[i].created_ts, 8, 1, sasahyou->file); - getdelim(&sasahyou->content[i].path, &max_path_len, 0, sasahyou->file); + sasahyou->database[i].id = i; + fread(&sasahyou->database[i].created_ts, 8, 1, sasahyou->file); + getdelim(&sasahyou->database[i].path, &max_path_len, 0, sasahyou->file); } else { - sasahyou->content[i].id = HOLE_ID; + sasahyou->database[i].id = HOLE_ID; r--; - sasahyou->holes[r] = sasahyou->content + i; + sasahyou->holes[r] = sasahyou->database + i; } } return 0; @@ -77,10 +77,10 @@ int sasahyou_save(Sasahyou *sasahyou) { fwrite(&sasahyou->hole_cnt, 8, 1, sasahyou->file); fflush(sasahyou->file); for (uint64_t i = 0; i < sasahyou->size; i++) { - if (sasahyou->content[i].id != HOLE_ID) { + if (sasahyou->database[i].id != HOLE_ID) { fputc(-1, sasahyou->file); - fwrite(&sasahyou->content[i].created_ts, 8, 1, sasahyou->file); - fputs(sasahyou->content[i].path, sasahyou->file); + fwrite(&sasahyou->database[i].created_ts, 8, 1, sasahyou->file); + fputs(sasahyou->database[i].path, sasahyou->file); fputc(0, sasahyou->file); } else { fputc(0, sasahyou->file); @@ -122,14 +122,14 @@ int sasa_add(Sasahyou *sasahyou, const char *path) { if (sasahyou->hole_cnt > 0) { sasahyou->hole_cnt--; Sasa **hole_ptr = sasahyou->holes + sasahyou->hole_cnt; - newbie.id = *hole_ptr - sasahyou->content; + newbie.id = *hole_ptr - sasahyou->database; **hole_ptr = newbie; sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); } else { newbie.id = sasahyou->size; sasahyou->size++; - sasahyou->content = realloc(sasahyou->content, sasahyou->size * sizeof(Sasa)); - sasahyou->content[newbie.id] = newbie; + sasahyou->database = realloc(sasahyou->database, sasahyou->size * sizeof(Sasa)); + sasahyou->database[newbie.id] = newbie; } sasahyou->modified_ts = newbie.created_ts; return 0; @@ -144,26 +144,26 @@ int sasa_rem_by_id(Sasahyou *sasahyou, uint64_t sasa_id) { fprintf(stderr, "Failed to remove sasa: target sasa does not exist\n"); return 1; } - if (sasahyou->content[sasa_id].id == HOLE_ID) { + if (sasahyou->database[sasa_id].id == HOLE_ID) { fprintf(stderr, "Failed to remove sasa: target sasa is already removed\n"); return 1; } - sasahyou->content[sasa_id].id = HOLE_ID; + sasahyou->database[sasa_id].id = HOLE_ID; sasahyou->hole_cnt++; sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); - sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->content + sasa_id; + sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->database + sasa_id; sasahyou->modified_ts = time(NULL); return 0; } int sasa_rem_by_path(Sasahyou *sasahyou, const char *path) { for (uint64_t i = 0; i < sasahyou->size; i++) { - if (strcmp(sasahyou->content[i].path, path) == 0) { - if (sasahyou->content[i].id != HOLE_ID) { - sasahyou->content[i].id = HOLE_ID; + if (strcmp(sasahyou->database[i].path, path) == 0) { + if (sasahyou->database[i].id != HOLE_ID) { + sasahyou->database[i].id = HOLE_ID; sasahyou->hole_cnt++; sasahyou->holes = realloc(sasahyou->holes, sasahyou->hole_cnt * sizeof(Sasa *)); - sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->content + i; + sasahyou->holes[sasahyou->hole_cnt - 1] = sasahyou->database + i; sasahyou->modified_ts = time(NULL); return 0; } else { diff --git a/src/core/shoppyou.c b/src/core/shoppyou.c index 6fffefc..7ca461d 100644 --- a/src/core/shoppyou.c +++ b/src/core/shoppyou.c @@ -11,7 +11,7 @@ int shoppyou_init(Shoppyou *shoppyou) { shoppyou->created_ts = time(NULL); shoppyou->modified_ts = shoppyou->created_ts; shoppyou->size = 0; - shoppyou->content = NULL; + shoppyou->database = NULL; shoppyou->hole_cnt = 0; shoppyou->holes = NULL; shoppyou->file = NULL; @@ -19,7 +19,7 @@ int shoppyou_init(Shoppyou *shoppyou) { } int shoppyou_free(Shoppyou *shoppyou) { - free(shoppyou->content); + free(shoppyou->database); free(shoppyou->holes); if (shoppyou->file != NULL) { fclose(shoppyou->file); @@ -44,11 +44,11 @@ int shoppyou_load(Shoppyou *shoppyou) { fread(&shoppyou->size, 8, 1, shoppyou->file); shoppyou->hole_cnt = 0; free(shoppyou->holes); - shoppyou->content = malloc(shoppyou->size * sizeof(Kazari)); + shoppyou->database = malloc(shoppyou->size * sizeof(Kazari)); for (uint64_t i = 0; i < shoppyou->size; i++) { - fread(&shoppyou->content[i].created_ts, 8, 1, shoppyou->file); - fread(&shoppyou->content[i].sasa_id, 8, 1, shoppyou->file); - fread(&shoppyou->content[i].tanzaku_id, 8, 1, shoppyou->file); + fread(&shoppyou->database[i].created_ts, 8, 1, shoppyou->file); + fread(&shoppyou->database[i].sasa_id, 8, 1, shoppyou->file); + fread(&shoppyou->database[i].tanzaku_id, 8, 1, shoppyou->file); } return 0; } @@ -66,10 +66,10 @@ int shoppyou_save(Shoppyou *shoppyou) { fwrite(&size, 8, 1, shoppyou->file); fflush(shoppyou->file); for (uint64_t i = 0; i < shoppyou->size; i++) { - if (shoppyou->content[i].sasa_id != 0 && shoppyou->content[i].tanzaku_id != 0) { - fwrite(&shoppyou->content[i].created_ts, 8, 1, shoppyou->file); - fwrite(&shoppyou->content[i].sasa_id, 8, 1, shoppyou->file); - fwrite(&shoppyou->content[i].tanzaku_id, 8, 1, shoppyou->file); + if (shoppyou->database[i].sasa_id != 0 && shoppyou->database[i].tanzaku_id != 0) { + fwrite(&shoppyou->database[i].created_ts, 8, 1, shoppyou->file); + fwrite(&shoppyou->database[i].sasa_id, 8, 1, shoppyou->file); + fwrite(&shoppyou->database[i].tanzaku_id, 8, 1, shoppyou->file); } } fflush(shoppyou->file); @@ -113,8 +113,8 @@ int kazari_add(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { shoppyou->holes = realloc(shoppyou->holes, shoppyou->hole_cnt * sizeof(Kazari *)); } else { shoppyou->size++; - shoppyou->content = realloc(shoppyou->content, shoppyou->size * sizeof(Kazari)); - shoppyou->content[shoppyou->size - 1] = newbie; + shoppyou->database = realloc(shoppyou->database, shoppyou->size * sizeof(Kazari)); + shoppyou->database[shoppyou->size - 1] = newbie; } shoppyou->modified_ts = newbie.created_ts; return 0; @@ -126,11 +126,11 @@ int kazari_rem(Shoppyou *shoppyou, uint64_t sasa_id, uint64_t tanzaku_id) { return 1; } for (uint64_t i = 0; i < shoppyou->size; i++) { - if (shoppyou->content[i].sasa_id == sasa_id && shoppyou->content[i].tanzaku_id == tanzaku_id) { - shoppyou->content[i].sasa_id = HOLE_ID; + if (shoppyou->database[i].sasa_id == sasa_id && shoppyou->database[i].tanzaku_id == tanzaku_id) { + shoppyou->database[i].sasa_id = HOLE_ID; shoppyou->hole_cnt++; shoppyou->holes = realloc(shoppyou->holes, shoppyou->hole_cnt * sizeof(Kazari *)); - shoppyou->holes[shoppyou->hole_cnt - 1] = shoppyou->content + i; + shoppyou->holes[shoppyou->hole_cnt - 1] = shoppyou->database + i; shoppyou->modified_ts = time(NULL); return 0; }