From 838440315ccc7e42b546c4320d5eda4193398133 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 5 Jan 2022 19:41:42 +0900 Subject: [PATCH 1/2] coredump: drop unnecessary initialization --- src/coredump/coredump.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index 3e38efe552..20503cfd3b 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -701,10 +701,10 @@ static int get_mount_namespace_leader(pid_t pid, pid_t *ret) { * Returns a negative number on errors. */ static int get_process_container_parent_cmdline(pid_t pid, char** cmdline) { - int r = 0; pid_t container_pid; const char *proc_root_path; struct stat root_stat, proc_root_stat; + int r; /* To compare inodes of / and /proc/[pid]/root */ if (stat("/", &root_stat) < 0) @@ -772,6 +772,7 @@ static int submit_coredump( bool truncated = false; JsonVariant *module_json; int r; + assert(context); assert(iovw); assert(input_fd >= 0); From 769020c09244c8e8015d102ca23cd19cba94ed28 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 5 Jan 2022 20:13:59 +0900 Subject: [PATCH 2/2] watchdog: adjust comment --- src/shared/watchdog.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/watchdog.c b/src/shared/watchdog.c index 3f4c72826d..ed2998f46c 100644 --- a/src/shared/watchdog.c +++ b/src/shared/watchdog.c @@ -66,7 +66,7 @@ static int watchdog_set_timeout(void) { if (ioctl(watchdog_fd, WDIOC_SETTIMEOUT, &sec) < 0) return -errno; - assert(sec > 0);/* buggy driver ? */ + assert(sec > 0); /* buggy driver ? */ watchdog_timeout = sec * USEC_PER_SEC; return 0;