[syslinux] [PATCH 1/4] elflink: Cleanup some warnings

[Liu Aleaxander]

Cleanup some unused variables, goto lables, and add the missing
header files.

Signed-off-by: Liu Aleaxander <Aleaxander at gmail.com>
---
 core/elflink/cli.c        |    1 -
 core/elflink/execute.c    |    3 +++
 core/elflink/get_key.c    |    2 ++
 core/elflink/getadv.c     |    2 +-
 core/elflink/load_env32.c |    6 ++++--
 core/elflink/readconfig.c |    1 -
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/core/elflink/cli.c b/core/elflink/cli.c
index f029ae4..4876dca 100644
--- a/core/elflink/cli.c
+++ b/core/elflink/cli.c
@@ -404,7 +404,6 @@ void process_command(const char *cmd)
 	else
 		execute(temp_cmd, KT_KERNEL);
 
-cleanup:
 	free(argv);
 	free(temp_cmd);
 }
diff --git a/core/elflink/execute.c b/core/elflink/execute.c
index 29e9933..1d024a6 100644
--- a/core/elflink/execute.c
+++ b/core/elflink/execute.c
@@ -15,7 +15,10 @@
 #include <stdio.h>
 
 #include <com32.h>
+#include <sys/exec.h>
 #include "menu.h"
+#include "core.h"
+#include "core-elf.h"
 
 void execute(const char *cmdline, enum kernel_type type)
 {
diff --git a/core/elflink/get_key.c b/core/elflink/get_key.c
index b2f7092..2a10290 100644
--- a/core/elflink/get_key.c
+++ b/core/elflink/get_key.c
@@ -43,6 +43,8 @@
 #include <sys/times.h>
 #include <sys/module.h>
 
+#include <syslinux/idle.h>
+
 #include "getkey.h"
 
 struct keycode {
diff --git a/core/elflink/getadv.c b/core/elflink/getadv.c
index 456084b..5578313 100644
--- a/core/elflink/getadv.c
+++ b/core/elflink/getadv.c
@@ -39,7 +39,7 @@
 const void *syslinux_getadv(int tag, size_t * size)
 {
     const uint8_t *p;
-    size_t left, len;
+    size_t left;
 
     p = syslinux_adv_ptr();
     left = syslinux_adv_size();
diff --git a/core/elflink/load_env32.c b/core/elflink/load_env32.c
index 8d0a557..3f4b6ff 100644
--- a/core/elflink/load_env32.c
+++ b/core/elflink/load_env32.c
@@ -68,7 +68,7 @@ static void call_constr(void)
 void enter_cmdline(void)
 {
 	struct cli_command  *comm, *aux;
-	char *cmdline;
+	const char *cmdline;
 
 	/* Enter endless command line prompt, should support "exit" */
 	while (1) {
@@ -89,7 +89,7 @@ void enter_cmdline(void)
 /* parameter is the config file name if any */
 void start_ui(char *config_file)
 {
-	char *cmdline;
+	const char *cmdline;
 	char *argv[2] = {config_file, NULL};
 
 	mp("enter, config file = %s", config_file);
@@ -112,6 +112,8 @@ void start_ui(char *config_file)
 /* note to self: do _*NOT*_ use static key word on this function */
 void load_env32(com32sys_t * regs)
 {
+	(void)regs;
+
 	printf("Starting 32 bit elf module subsystem...\n");
 	call_constr();
 	openconsole(&dev_rawcon_r, &dev_ansiserial_w);
diff --git a/core/elflink/readconfig.c b/core/elflink/readconfig.c
index c984fa8..30abbcd 100644
--- a/core/elflink/readconfig.c
+++ b/core/elflink/readconfig.c
@@ -1135,7 +1135,6 @@ void parse_configs(char **argv)
     const char *filename;
     struct menu *m;
     struct menu_entry *me;
-    char *cmdline;
     mp("enter");
 
     empty_string = refstrdup("");
-- 
1.7.0.1