From 09b676fc21b9be5b3acec72476596c6cfffce638 Mon Sep 17 00:00:00 2001 From: objnull Date: Thu, 5 Sep 2024 16:14:08 -0400 Subject: [PATCH] Created more conventional naming scheme for structures creation & deletion --- project/backend/manager.c | 6 +++--- project/backend/manager.h | 4 ++-- project/backend/pass.c | 4 ++-- project/backend/pass.h | 4 ++-- project/backend/ui.c | 4 ++-- project/backend/ui.h | 4 ++-- project/flippypass.c | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/project/backend/manager.c b/project/backend/manager.c index fc59010..bfbb4de 100644 --- a/project/backend/manager.c +++ b/project/backend/manager.c @@ -37,7 +37,7 @@ char** split_string(const char* str, char delimiter, int* count) { } // Constructors -Manager* manager_create() { +Manager* manager_init() { // Creating result in memory Manager* result = malloc(sizeof(Manager)); @@ -160,7 +160,7 @@ void manager_loadpass(Manager* manager, char* name) { // Does the password name match? if (!strcmp(name, split[i])) { // Setting the new current password - manager->current = pass_create( + manager->current = pass_init( name, split[i+1], split[i+2], @@ -178,7 +178,7 @@ void manager_loadpass(Manager* manager, char* name) { // DEBUG FURI_LOG_D(TAG, "Loaded Password: %s, %s, %s", manager->current->name, manager->current->user, manager->current->phrase); } -void manager_delete(Manager* manager) { +void manager_free(Manager* manager) { for(int i = 0; i < 4; i++) { free(manager->names[i]); } diff --git a/project/backend/manager.h b/project/backend/manager.h index dc919b5..1d6f1f2 100644 --- a/project/backend/manager.h +++ b/project/backend/manager.h @@ -18,12 +18,12 @@ typedef struct { } Manager; // Constructors -Manager* manager_create(); +Manager* manager_init(); // Functions void manager_switchpage(Manager* manager, int dir); void manager_loadnames(Manager* manager, int page); void manager_loadpass(Manager* manager, char* name); -void manager_delete(Manager* manager); +void manager_free(Manager* manager); #endif \ No newline at end of file diff --git a/project/backend/pass.c b/project/backend/pass.c index b009ba7..a3342dc 100644 --- a/project/backend/pass.c +++ b/project/backend/pass.c @@ -3,7 +3,7 @@ #include // Constructors -Password* pass_create(char* name, char* user, char* phrase, int folder) { +Password* pass_init(char* name, char* user, char* phrase, int folder) { // Creating a new instance of a password Password* result = malloc(sizeof(Password)); @@ -18,6 +18,6 @@ Password* pass_create(char* name, char* user, char* phrase, int folder) { } // Functions -void pass_delete(Password* pass){ +void pass_free(Password* pass){ free(pass); } \ No newline at end of file diff --git a/project/backend/pass.h b/project/backend/pass.h index e884390..642bc69 100644 --- a/project/backend/pass.h +++ b/project/backend/pass.h @@ -15,9 +15,9 @@ typedef struct { } Password; // Constructors -Password* pass_create(char* name, char* user, char* phrase, int folder); +Password* pass_init(char* name, char* user, char* phrase, int folder); // Functions -void pass_delete(Password* pass); +void pass_free(Password* pass); #endif \ No newline at end of file diff --git a/project/backend/ui.c b/project/backend/ui.c index d5a5d24..ce742ec 100644 --- a/project/backend/ui.c +++ b/project/backend/ui.c @@ -158,7 +158,7 @@ bool FP_SceneManager_Callback_Navigation(void* context) { } // Constructors -FP_App* fp_app_create() { +FP_App* fp_app_init() { // Allocate memory for new app variable FP_App* result = malloc(sizeof(FP_App)); @@ -203,7 +203,7 @@ void fp_app_run(FP_App* app) { /* Post Application */ furi_record_close(RECORD_GUI); } -void fp_app_delete(FP_App* app) { +void fp_app_free(FP_App* app) { // Freeing stuff from memory scene_manager_free(app->scene_manager); view_dispatcher_remove_view(app->view_dispatcher, FP_View_Submenu); diff --git a/project/backend/ui.h b/project/backend/ui.h index dafcef2..4a03203 100644 --- a/project/backend/ui.h +++ b/project/backend/ui.h @@ -25,10 +25,10 @@ typedef struct { } FP_App; // Constructors -FP_App* fp_app_create(); +FP_App* fp_app_init(); // Functions void fp_app_run(FP_App* app); -void fp_app_delete(FP_App* app); +void fp_app_free(FP_App* app); #endif \ No newline at end of file diff --git a/project/flippypass.c b/project/flippypass.c index 0697a55..111a22b 100644 --- a/project/flippypass.c +++ b/project/flippypass.c @@ -17,13 +17,13 @@ int32_t flippypass_app(void* p) { debug_template(); // Creating App - FP_App* app = fp_app_create(); + FP_App* app = fp_app_init(); // Running app fp_app_run(app); // Cleanup - fp_app_delete(app); + fp_app_free(app); // Exit App return 0;