From 91a53fa703058bcffe0ccfcc8bc68ca30671222c Mon Sep 17 00:00:00 2001 From: Masahiko AMANO Date: Fri, 23 Dec 2022 15:35:18 +0300 Subject: [PATCH] feat(core): remove tanzaku alias field --- include/core.h | 3 +-- src/core/sappyou.c | 10 +--------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/include/core.h b/include/core.h index c291bb4..29b638b 100644 --- a/include/core.h +++ b/include/core.h @@ -28,7 +28,6 @@ typedef struct tanzaku { uint64_t created_ts; // Tanzaku creation timestamp uint64_t modified_ts; // Tanzaku last modification timestamp char *name; // Tanzaku name - char *alias; // Tanzaku alias char *description; // Tanzaku description } Tanzaku; @@ -133,7 +132,7 @@ int sappyou_open(Sappyou *sappyou, const char *path); int sappyou_dump(Sappyou *sappyou, const char *path); // Add new tanzaku to sappyou -int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const char *description); +int tanzaku_add(Sappyou *sappyou, const char *name, const char *description); // Remove tanzaku from sappyou int tanzaku_rem(Sappyou *sappyou, uint64_t tanzaku_id); diff --git a/src/core/sappyou.c b/src/core/sappyou.c index 7a7c723..4c381b5 100644 --- a/src/core/sappyou.c +++ b/src/core/sappyou.c @@ -21,7 +21,6 @@ int sappyou_init(Sappyou *sappyou) { int sappyou_free(Sappyou *sappyou) { for (uint64_t i = 0; i < sappyou->size; i++) { free(sappyou->database[i].name); - free(sappyou->database[i].alias); free(sappyou->database[i].description); } free(sappyou->database); @@ -56,7 +55,6 @@ int sappyou_load(Sappyou *sappyou) { 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->database[i].id = HOLE_ID; @@ -86,8 +84,6 @@ int sappyou_save(Sappyou *sappyou) { fwrite(&sappyou->database[i].modified_ts, 8, 1, sappyou->file); fputs(sappyou->database[i].name, sappyou->file); fputc(0, sappyou->file); - fputs(sappyou->database[i].alias, sappyou->file); - fputc(0, sappyou->file); fputs(sappyou->database[i].description, sappyou->file); fputc(0, sappyou->file); } else { @@ -116,7 +112,7 @@ int sappyou_dump(Sappyou *sappyou, const char *path) { return sappyou_save(sappyou); } -int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const char *description) { +int tanzaku_add(Sappyou *sappyou, const char *name, const char *description) { if (sappyou->size == -1 && sappyou->hole_cnt == 0) { fprintf(stderr, "Failed to add tanzaku: sappyou is full\n"); return 1; @@ -125,14 +121,10 @@ int tanzaku_add(Sappyou *sappyou, const char *name, const char *alias, const cha newbie.created_ts = time(NULL); newbie.modified_ts = newbie.created_ts; size_t name_size = strlen(name), - alias_size = strlen(alias), description_size = strlen(description); newbie.name = malloc(name_size + 1); strcpy(newbie.name, name); newbie.name[name_size] = 0; - newbie.alias = malloc(alias_size + 1); - strcpy(newbie.alias, alias); - newbie.alias[alias_size] = 0; newbie.description = malloc(description_size + 1); strcpy(newbie.description, description); newbie.description[description_size] = 0;