From f5169e8a8fccaca864374fa0ee9455d651206210 Mon Sep 17 00:00:00 2001 From: Timerix Date: Wed, 26 Nov 2025 17:06:32 +0500 Subject: [PATCH] str_destroy --- README.md | 7 +++++-- dependencies/tlibc | 2 +- src/cli/ClientCLI/ClientCLI.c | 6 +++--- src/cli/modes/RsaGen.c | 8 ++++---- src/client/ServerConnection.c | 4 ++-- src/client/client.c | 2 +- src/db/idb.c | 8 ++++---- src/server/responses/Login.c | 2 +- src/server/responses/Register.c | 2 +- src/server/server.c | 6 +++--- 10 files changed, 25 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index dc3df31..d63a824 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,20 @@ # tcp-chat ## Build -1. Clone the repository with submodules. +1. Clone this repository with submodules. ``` git clone --recurse-submodules --depth 0 https://timerix.ddns.net/git/Timerix/tcp-chat.git ``` -2. Install [cbuild](https://timerix.ddns.net/git/Timerix/cbuild). + +2. Install [cbuild](https://timerix.ddns.net/git/Timerix/cbuild) version specified in `project.config`. + 3. Build executable ``` cd tcp-chat cbuild build_exec ``` + ## Usage **Client:** ```sh diff --git a/dependencies/tlibc b/dependencies/tlibc index 4c97787..8a40caa 160000 --- a/dependencies/tlibc +++ b/dependencies/tlibc @@ -1 +1 @@ -Subproject commit 4c97787c27af5b7867c8a1262a3383a84a1d4957 +Subproject commit 8a40caaf1044f9fe2c327c4d3c60a3310efd6142 diff --git a/src/cli/ClientCLI/ClientCLI.c b/src/cli/ClientCLI/ClientCLI.c index 655004c..7a864dc 100644 --- a/src/cli/ClientCLI/ClientCLI.c +++ b/src/cli/ClientCLI/ClientCLI.c @@ -57,8 +57,8 @@ Result(void) ClientCLI_run(ClientCLI* self) { str username = str_null, password = str_null; try_void(ClientCLI_askUserNameAndPassword(&username, &password)); Defer( - str_free(username); - str_free(password); + str_destroy(username); + str_destroy(password); ); Client_free(self->client); try(self->client, p, Client_create(username, password)); @@ -85,7 +85,7 @@ Result(void) ClientCLI_run(ClientCLI* self) { Error_addCallPos(com_result.error, ErrorCallPos_here()); str e_str = Error_toStr(com_result.error); printf("\n"FMT_str"\n", e_str.len, e_str.data); - str_free(e_str); + str_destroy(e_str); Error_free(com_result.error); } } diff --git a/src/cli/modes/RsaGen.c b/src/cli/modes/RsaGen.c index 5830131..b5f8bd7 100644 --- a/src/cli/modes/RsaGen.c +++ b/src/cli/modes/RsaGen.c @@ -31,11 +31,11 @@ Result(void) run_RsaGenStdin(u32 key_size) { str sk_str = RSA_serializePrivateKey_base64(&sk); printf("rsa_private_key = %s\n", sk_str.data); - str_free(sk_str); + str_destroy(sk_str); str pk_str = RSA_serializePublicKey_base64(&pk); printf("\nrsa_public_key = %s\n", pk_str.data); - str_free(pk_str); + str_destroy(pk_str); Return RESULT_VOID; } @@ -54,11 +54,11 @@ Result(void) run_RsaGenRandom(u32 key_size) { str sk_str = RSA_serializePrivateKey_base64(&sk); printf("rsa_private_key = %s\n", sk_str.data); - str_free(sk_str); + str_destroy(sk_str); str pk_str = RSA_serializePublicKey_base64(&pk); printf("\nrsa_public_key = %s\n", pk_str.data); - str_free(pk_str); + str_destroy(pk_str); Return RESULT_VOID; } diff --git a/src/client/ServerConnection.c b/src/client/ServerConnection.c index 3bcf2ee..8786dee 100644 --- a/src/client/ServerConnection.c +++ b/src/client/ServerConnection.c @@ -8,8 +8,8 @@ void ServerConnection_close(ServerConnection* self){ EncryptedSocketTCP_destroy(&self->sock); Array_u8_destroy(&self->token); Array_u8_destroy(&self->session_key); - str_free(self->server_name); - str_free(self->server_description); + str_destroy(self->server_name); + str_destroy(self->server_description); free(self); } diff --git a/src/client/client.c b/src/client/client.c index 340c9c0..a1a3ced 100644 --- a/src/client/client.c +++ b/src/client/client.c @@ -5,7 +5,7 @@ void Client_free(Client* self){ if(!self) return; - str_free(self->username); + str_destroy(self->username); Array_u8_destroy(&self->user_data_key); ServerConnection_close(self->conn); free(self); diff --git a/src/db/idb.c b/src/db/idb.c index 70bce8e..f515858 100644 --- a/src/db/idb.c +++ b/src/db/idb.c @@ -49,9 +49,9 @@ static void Table_close(Table* t){ return; fclose(t->table_file); fclose(t->changes_file); - str_free(t->name); - str_free(t->table_file_path); - str_free(t->changes_file_path); + str_destroy(t->name); + str_destroy(t->table_file_path); + str_destroy(t->changes_file_path); pthread_mutex_destroy(&t->mutex); Array_u8_destroy(&t->enc_buf); free(t); @@ -207,7 +207,7 @@ static Result(void) Table_validateRowSize(Table* t, u32 row_size){ void idb_close(IncrementalDB* db){ if(db == NULL) return; - str_free(db->db_dir); + str_destroy(db->db_dir); Array_u8_destroy(&db->aes_key); HashMap_destroy(&db->tables_map); pthread_mutex_destroy(&db->mutex); diff --git a/src/server/responses/Login.c b/src/server/responses/Login.c index 6e0dffc..f2102bd 100644 --- a/src/server/responses/Login.c +++ b/src/server/responses/Login.c @@ -26,7 +26,7 @@ declare_RequestHandler(Login) str username_str = str_null; str name_error_str = validateUsername_cstr(req.username, &username_str); if(name_error_str.data){ - Defer(str_free(name_error_str)); + Defer(str_destroy(name_error_str)); try_void(sendErrorMessage(log_ctx, conn, res_head, LogSeverity_Warn, name_error_str diff --git a/src/server/responses/Register.c b/src/server/responses/Register.c index 29957e3..4647fa5 100644 --- a/src/server/responses/Register.c +++ b/src/server/responses/Register.c @@ -26,7 +26,7 @@ declare_RequestHandler(Register) str username_str = str_null; str name_error_str = validateUsername_cstr(req.username, &username_str); if(name_error_str.data){ - Defer(str_free(name_error_str)); + Defer(str_destroy(name_error_str)); try_void(sendErrorMessage(log_ctx, conn, res_head, LogSeverity_Warn, name_error_str diff --git a/src/server/server.c b/src/server/server.c index 6bcc0b3..66d6268 100644 --- a/src/server/server.c +++ b/src/server/server.c @@ -14,8 +14,8 @@ void Server_free(Server* self){ if(!self) return; - str_free(self->name); - str_free(self->description); + str_destroy(self->name); + str_destroy(self->description); RSA_destroyPrivateKey(&self->rsa_sk); RSA_destroyPublicKey(&self->rsa_pk); @@ -204,7 +204,7 @@ static void* handleConnection(void* _args){ Error_addCallPos(r.error, ErrorCallPos_here()); str e_str = Error_toStr(r.error); logError(FMT_str, e_str.len, e_str.data); - str_free(e_str); + str_destroy(e_str); Error_free(r.error); }