From a2f01bee5f0a743c29a35cc8fea167c4aac06276 Mon Sep 17 00:00:00 2001 From: Noel Eck Date: Thu, 14 Jun 2018 21:21:37 -0700 Subject: [PATCH] mraa.c: Added pointer to pointer back to find_uart Went a bit too far with the previous commit. Added pointer to pointer back to mraa_find_uart_bus_pci. Tested leaks against valgrind and verified dev_path gets set with gdb. Signed-off-by: Noel Eck --- include/mraa_internal.h | 2 +- src/mraa.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/mraa_internal.h b/include/mraa_internal.h index 7d1f2e3..b9cb129 100644 --- a/include/mraa_internal.h +++ b/include/mraa_internal.h @@ -176,7 +176,7 @@ int mraa_find_i2c_bus_pci(const char* pci_device, const char *pci_id, const char * @param dev_name as retrieved from pci_dev_path * @return Result of the operation */ -mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name); +mraa_result_t mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name); #if defined(IMRAA) /** diff --git a/src/mraa.c b/src/mraa.c index 32b10d0..631b38e 100644 --- a/src/mraa.c +++ b/src/mraa.c @@ -1142,7 +1142,7 @@ mraa_link_targets(const char* filename, const char* targetname) } mraa_result_t -mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name) +mraa_find_uart_bus_pci(const char* pci_dev_path, char** dev_name) { char path[PATH_MAX]; const int max_allowable_len = 16; @@ -1158,14 +1158,14 @@ mraa_find_uart_bus_pci(const char* pci_dev_path, char* dev_name) return MRAA_ERROR_INVALID_RESOURCE; } - dev_name = (char*) malloc(sizeof(char) * max_allowable_len); + *dev_name = (char*) malloc(sizeof(char) * max_allowable_len); - snprintf(dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name); + snprintf(*dev_name, max_allowable_len, "/dev/%s", namelist[n - 1]->d_name); while (n--) { free(namelist[n]); } free(namelist); - syslog(LOG_INFO, "UART device: %s selected for initialization", dev_name); + syslog(LOG_INFO, "UART device: %s selected for initialization", *dev_name); return MRAA_SUCCESS; }