From 200f49ff353ee8266505316659493ffc4082c803 Mon Sep 17 00:00:00 2001 From: lifeng68 Date: Tue, 5 Jan 2021 18:48:20 +0800 Subject: [PATCH 03/53] clean code: fix clean code Signed-off-by: lifeng68 --- .../layer_store/graphdriver/devmapper/wrapper_devmapper.c | 2 +- src/utils/console/console.c | 2 +- src/utils/cutils/utils.c | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c index 1dcdf595..5748ec54 100644 --- a/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c +++ b/src/daemon/modules/image/oci/storage/layer_store/graphdriver/devmapper/wrapper_devmapper.c @@ -892,7 +892,7 @@ int dev_active_device(const char *pool_name, const char *name, int device_id, ui ERROR("devicemapper: error running deviceCreate (ActivateDevice) %d", ret); ret = -1; } - + DEBUG("Start udev wait on create device"); dev_udev_wait(cookie); out: diff --git a/src/utils/console/console.c b/src/utils/console/console.c index cb748196..7fda519c 100644 --- a/src/utils/console/console.c +++ b/src/utils/console/console.c @@ -68,7 +68,7 @@ static int console_cb_tty_stdin_with_escape(int fd, uint32_t events, void *cbdat } if (c == 'q' && ts->saw_tty_exit) { - ret = 1; + ret = EPOLL_LOOP_HANDLE_CLOSE; goto out; } diff --git a/src/utils/cutils/utils.c b/src/utils/cutils/utils.c index 1e777dc3..9107f540 100644 --- a/src/utils/cutils/utils.c +++ b/src/utils/cutils/utils.c @@ -493,7 +493,6 @@ out: static void set_stderr_buf(char **stderr_buf, const char *format, ...) { char errbuf[BUFSIZ + 1] = { 0 }; - char *jerr = NULL; UTIL_FREE_AND_SET_NULL(*stderr_buf); @@ -511,7 +510,6 @@ static void set_stderr_buf(char **stderr_buf, const char *format, ...) if (*stderr_buf == NULL) { *stderr_buf = util_strdup_s(errbuf); } - free(jerr); } static int open_devnull(void) -- 2.25.1