[syslinux:elflink] conio: Fix up compiler warnings
syslinux-bot for Matt Fleming
matt.fleming at intel.com
Tue Apr 17 11:24:19 PDT 2012
Commit-ID: 47a926bb39867b106527b2993faffcb524e87ad6
Gitweb: http://www.syslinux.org/commit/47a926bb39867b106527b2993faffcb524e87ad6
Author: Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 3 Apr 2012 16:00:53 +0100
Committer: Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 17 Apr 2012 11:23:41 +0100
conio: Fix up compiler warnings
conio.c: In function ‘pm_getchar’:
conio.c:336:2: warning: pointer targets in passing argument 1 of ‘getchar’ differ in signedness
conio.c:268:6: note: expected ‘char *’ but argument is of type ‘uint8_t *’
conio.c: In function ‘pm_pollchar’:
conio.c:261:1: warning: control reaches end of non-void function
Signed-off-by: Matt Fleming <matt.fleming at intel.com>
---
core/conio.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/core/conio.c b/core/conio.c
index 70dd3b1..dd18ecf 100644
--- a/core/conio.c
+++ b/core/conio.c
@@ -252,7 +252,7 @@ int pollchar(void)
return data;
}
-int pm_pollchar(com32sys_t *regs)
+void pm_pollchar(com32sys_t *regs)
{
if (pollchar())
regs->eflags.l &= ~EFLAGS_ZF;
@@ -288,7 +288,7 @@ char getchar(char *hi)
sti(); /* We already know we'll consume data */
data = *SerialTail++;
- SerialTail = (unsigned char *)((unsigned long)SerialTail & (serial_buf_size - 1));
+ SerialTail = (char *)((unsigned long)SerialTail & (serial_buf_size - 1));
} else {
/* LSR */
data = inb(SerialPort + 5) & 1;
@@ -333,7 +333,7 @@ char getchar(char *hi)
void pm_getchar(com32sys_t *regs)
{
- regs->eax.b[0] = getchar(®s->eax.b[1]);
+ regs->eax.b[0] = getchar((char *)®s->eax.b[1]);
}
static void msg_setbg(char data)
More information about the Syslinux-commits
mailing list