[syslinux:lwip] pxe: fix gcc 4.6 problems

syslinux-bot for H. Peter Anvin hpa at zytor.com
Fri Apr 22 20:06:17 PDT 2011


Commit-ID:  756d43cede941d410ba1f876cb7dd0fd0201fb90
Gitweb:     http://syslinux.zytor.com/commit/756d43cede941d410ba1f876cb7dd0fd0201fb90
Author:     H. Peter Anvin <hpa at zytor.com>
AuthorDate: Thu, 21 Apr 2011 21:23:54 -0700
Committer:  H. Peter Anvin <hpa at zytor.com>
CommitDate: Thu, 21 Apr 2011 21:23:54 -0700

pxe: fix gcc 4.6 problems

Remove unused variables, which give gcc 4.6 problems.

Signed-off-by: H. Peter Anvin <hpa at zytor.com>


---
 core/fs/pxe/isr.c  |    3 +--
 core/fs/pxe/tftp.c |    2 --
 2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/core/fs/pxe/isr.c b/core/fs/pxe/isr.c
index cb2300e..eacf4f8 100644
--- a/core/fs/pxe/isr.c
+++ b/core/fs/pxe/isr.c
@@ -137,13 +137,12 @@ void pxe_init_isr(void)
 void pxe_cleanup_isr(void)
 {
     static __lowmem struct s_PXENV_UNDI_CLOSE undi_close;
-    int err;
 
     sched_hook_func = NULL;
     core_pm_hook = core_pm_null_hook;
     kill_thread(pxe_thread);
  
     memset(&undi_close, 0, sizeof(undi_close));
-    err = pxe_call(PXENV_UNDI_CLOSE, &undi_close);
+    pxe_call(PXENV_UNDI_CLOSE, &undi_close);
     uninstall_irq_vector(pxe_irq_vector, pxe_isr, &pxe_irq_chain);
 }
diff --git a/core/fs/pxe/tftp.c b/core/fs/pxe/tftp.c
index 4f21a48..06566d3 100644
--- a/core/fs/pxe/tftp.c
+++ b/core/fs/pxe/tftp.c
@@ -227,7 +227,6 @@ void tftp_open(struct inode *inode, uint32_t ip, uint16_t server_port,
     const uint8_t  *timeout_ptr;
     jiffies_t timeout;
     jiffies_t oldtime;
-    uint16_t tid;
     uint16_t opcode;
     uint16_t blk_num;
     uint32_t opdata, *opdata_ptr;
@@ -269,7 +268,6 @@ sendreq:
     oldtime = jiffies();
 
     socket->tftp_remoteip = ip;
-    tid = socket->tftp_localport;   /* TID(local port No) */
     nbuf = netbuf_new();
     netbuf_ref(nbuf, rrq_packet_buf, rrq_len);
     addr.addr = ip;



More information about the Syslinux-commits mailing list