[syslinux:elflink] ldlinux: Fix number of arguments to start_ldlinux()
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Tue Apr 17 11:24:15 PDT 2012
Commit-ID: a523208a0d1bb820d82c5b00125876476453afd1
Gitweb: http://www.syslinux.org/commit/a523208a0d1bb820d82c5b00125876476453afd1
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Mon, 2 Apr 2012 15:51:45 +0100
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 17 Apr 2012 10:58:34 +0100
ldlinux: Fix number of arguments to start_ldlinux()
Commit 3a316db1 ("ldlinux: Loading a config file should cause
re-initialisation") added a call to start_ldlinux() with an incorrect
number of arguments. Add the prototype to core.h so this error doesn't
go unnoticed again.
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
com32/elflink/ldlinux/execute.c | 2 +-
core/include/core.h | 2 ++
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c
index 7dde6cf..9a17cf5 100644
--- a/com32/elflink/ldlinux/execute.c
+++ b/com32/elflink/ldlinux/execute.c
@@ -96,7 +96,7 @@ void execute(const char *cmdline, enum kernel_type type)
if (*args)
mangle_name(config_cwd, args);
- start_ldlinux("ldlinux.c32", 1, argv);
+ start_ldlinux(argv);
} else if (type == KT_LOCALBOOT) {
/* process the image need int 22 support */
ireg.eax.w[0] = 0x0014; /* Local boot */
diff --git a/core/include/core.h b/core/include/core.h
index d2aaf72..c1b2671 100644
--- a/core/include/core.h
+++ b/core/include/core.h
@@ -99,4 +99,6 @@ static inline void set_flags(com32sys_t *regs, uint32_t flags)
regs->eflags.l = eflags;
}
+extern int start_ldlinux(char **argv);
+
#endif /* CORE_H */
More information about the Syslinux-commits
mailing list