From 9118f753f42781b441dd44651d49ded4a195ba6b Mon Sep 17 00:00:00 2001 From: Martin Ling Date: Tue, 31 Dec 2019 16:50:55 +0100 Subject: [PATCH] linux: Fix compile warning on gcc 6+ for readlink() call. Fixes #1268. --- linux.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/linux.c b/linux.c index 0f1367f..8f32085 100644 --- a/linux.c +++ b/linux.c @@ -46,7 +46,7 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port) char manufacturer[128], product[128], serial[128]; char baddr[32]; const char dir_name[] = "/sys/class/tty/%s/device/%s%s"; - char sub_dir[32] = "", file_name[PATH_MAX]; + char sub_dir[32] = "", link_name[PATH_MAX], file_name[PATH_MAX]; char *ptr, *dev = port->name + 5; FILE *file; int i, count; @@ -55,12 +55,12 @@ SP_PRIV enum sp_return get_port_details(struct sp_port *port) if (strncmp(port->name, "/dev/", 5)) RETURN_ERROR(SP_ERR_ARG, "Device name not recognized"); - snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s", dev); - if (lstat(file_name, &statbuf) == -1) + snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s", dev); + if (lstat(link_name, &statbuf) == -1) RETURN_ERROR(SP_ERR_ARG, "Device not found"); if (!S_ISLNK(statbuf.st_mode)) - snprintf(file_name, sizeof(file_name), "/sys/class/tty/%s/device", dev); - count = readlink(file_name, file_name, sizeof(file_name)); + snprintf(link_name, sizeof(link_name), "/sys/class/tty/%s/device", dev); + count = readlink(link_name, file_name, sizeof(file_name)); if (count <= 0 || count >= (int)(sizeof(file_name) - 1)) RETURN_ERROR(SP_ERR_ARG, "Device not found"); file_name[count] = 0;