console-server: Assign NULL in declarations for brevity
Declaring and then separately assigning the tty stack variables was
pretty verbose. No complex initialisation was performed that might
justify separating them, so let's combine them.
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Change-Id: Ifea0ca68f65a2f2eaec48cac303c70099d6153ab
diff --git a/console-server.c b/console-server.c
index f52c719..fdf214f 100644
--- a/console-server.c
+++ b/console-server.c
@@ -59,21 +59,14 @@
/* populates tty_dev and tty_sysfs_devnode, using the tty kernel name */
static int tty_find_device(struct console *console)
{
- char *tty_class_device_link;
- char *tty_device_tty_dir;
- char *tty_device_reldir;
- char *tty_path_input;
- char *tty_path_input_real;
- char *tty_kname_real;
+ char *tty_class_device_link = NULL;
+ char *tty_path_input_real = NULL;
+ char *tty_device_tty_dir = NULL;
+ char *tty_device_reldir = NULL;
+ char *tty_path_input = NULL;
+ char *tty_kname_real = NULL;
int rc;
- tty_class_device_link = NULL;
- tty_device_tty_dir = NULL;
- tty_device_reldir = NULL;
- tty_path_input = NULL;
- tty_path_input_real = NULL;
- tty_kname_real = NULL;
-
/* udev may rename the tty name with a symbol link, try to resolve */
rc = asprintf(&tty_path_input, "/dev/%s", console->tty_kname);
if (rc < 0) {