From c01c674e98fe294da09200dbad4b1062b49ef2a0 Mon Sep 17 00:00:00 2001 From: Chunyan Liu Date: Fri, 8 Apr 2016 12:12:27 +0800 Subject: [PATCH] libxl: bind_usbintf: do not reuse 'path' To avoid confusion, use "intf_path" to indicate driver/interface path, and "bind_path" indicate driver/bind path. CID: 1358111 Signed-off-by: Chunyan Liu CC: Simon Cao CC: George Dunlap Acked-by: Ian Jackson --- tools/libxl/libxl_pvusb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/libxl/libxl_pvusb.c b/tools/libxl/libxl_pvusb.c index 07030a4bc3..c66733bba9 100644 --- a/tools/libxl/libxl_pvusb.c +++ b/tools/libxl/libxl_pvusb.c @@ -1096,33 +1096,33 @@ out: static int bind_usbintf(libxl__gc *gc, const char *intf, const char *drvpath) { - char *path; + char *bind_path, *intf_path; struct stat st; int fd = -1; int rc, r; - path = GCSPRINTF("%s/%s", drvpath, intf); + intf_path = GCSPRINTF("%s/%s", drvpath, intf); /* check through lstat, if intf already exists under drvpath, * it's already bound, return directly; if it doesn't exist, * continue to do bind work; otherwise, return error. */ - r = lstat(path, &st); + r = lstat(intf_path, &st); if (r == 0) return 0; if (r < 0 && errno != ENOENT) return ERROR_FAIL; - path = GCSPRINTF("%s/bind", drvpath); + bind_path = GCSPRINTF("%s/bind", drvpath); - fd = open(path, O_WRONLY); + fd = open(bind_path, O_WRONLY); if (fd < 0) { - LOGE(ERROR, "open file failed: '%s'", path); + LOGE(ERROR, "open file failed: '%s'", bind_path); rc = ERROR_FAIL; goto out; } - if (libxl_write_exactly(CTX, fd, intf, strlen(intf), path, intf)) { + if (libxl_write_exactly(CTX, fd, intf, strlen(intf), bind_path, intf)) { rc = ERROR_FAIL; goto out; } -- 2.39.5