From 509b32c6344cc8f2532003e066cfe9dbac20c461 Mon Sep 17 00:00:00 2001 From: Jakob Olsson <jakobols@kth.se> Date: Mon, 11 Jun 2018 16:25:33 +0200 Subject: [PATCH] minor style fixes --- dongle.c | 3 ++- dongle_infrastructure.c | 2 ++ stack_operations.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dongle.c b/dongle.c index db9fba9..cbd7f86 100644 --- a/dongle.c +++ b/dongle.c @@ -269,6 +269,7 @@ char *lexer(char **input, char *delimiter) if (token) { *token = '\0'; + substr = strdup(*input); if (!substr) { perror("strdup"); @@ -344,6 +345,7 @@ char *get_device_name(char *dir_name) while (!list_empty(&stack) && !name) { dr = pop(&stack); + dir = opendir(dr->path); if (!dir) { free(dr->path); @@ -434,7 +436,6 @@ int get_devices_from_path(char *input_path) continue; } snprintf(path, PATH_MAX, "%s/", input_path); - name = get_device_name(path); if (!name) continue; diff --git a/dongle_infrastructure.c b/dongle_infrastructure.c index 295ee02..76d9c5d 100644 --- a/dongle_infrastructure.c +++ b/dongle_infrastructure.c @@ -684,11 +684,13 @@ void dongle_destroy_dynamic_object(struct ubus_object **obj) { if (!(*obj)) return; + if ((*obj)->name) { free((*obj)->name); (*obj)->name = NULL; } if (*obj) free(*obj); + *obj = NULL; } diff --git a/stack_operations.c b/stack_operations.c index 25add58..8ba8ab0 100644 --- a/stack_operations.c +++ b/stack_operations.c @@ -55,4 +55,4 @@ void print_list_dfs(struct list_head *list) list_for_each_entry(dr, list, list) { printf("path: %s\n", dr->path); } -} \ No newline at end of file +} -- GitLab