diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2011-03-16 12:53:58 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2011-03-16 12:53:58 -0700 |
| commit | 8c576f1fe03e34879921311f46613a35c6530000 (patch) | |
| tree | 7eacb2c747d6778cde4e3e1a45a4c51372725e2a /com32/elflink/ldlinux/cli.c | |
| parent | 1c5f52052c2452c159498fb1beb941d3b40d4661 (diff) | |
| parent | d8ed6505926c83a309ebc946f5795781a2392f7c (diff) | |
| download | syslinux-8c576f1fe03e34879921311f46613a35c6530000.tar.gz syslinux-8c576f1fe03e34879921311f46613a35c6530000.tar.xz syslinux-8c576f1fe03e34879921311f46613a35c6530000.zip | |
Merge remote-tracking branch 'mfleming/for-hpa/elflink/fix-compiler-warnings' into elflink
Diffstat (limited to 'com32/elflink/ldlinux/cli.c')
| -rw-r--r-- | com32/elflink/ldlinux/cli.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c index defc6d0f..172a9f68 100644 --- a/com32/elflink/ldlinux/cli.c +++ b/com32/elflink/ldlinux/cli.c @@ -454,7 +454,7 @@ void process_command(const char *cmd, bool history) // dprintf("raw cmd = %s", cmd); strcpy(temp_cmd, cmd); - module_name = strtok(cmd, COMMAND_DELIM); + module_name = strtok((char *)cmd, COMMAND_DELIM); len_mn = strlen(module_name); if (!strcmp(module_name + len_mn - 4, ".c32")) { @@ -473,7 +473,7 @@ void process_command(const char *cmd, bool history) } while (argc < MAX_COMMAND_ARGS); argv[argc] = NULL; module_load_dependencies(module_name, MODULES_DEP); - spawn_load(module_name, argv); + spawn_load(module_name, (const char **)argv); } else if (!strcmp(module_name + len_mn - 2, ".0")) { execute(cmd, KT_PXE); } else if (!strcmp(module_name + len_mn - 3, ".bs")) { @@ -494,7 +494,6 @@ void process_command(const char *cmd, bool history) else execute(temp_cmd, KT_KERNEL); -cleanup: free(argv); free(temp_cmd); } |