summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Aleaxander <Aleaxander@gmail.com>2009-08-08 17:49:48 +0800
committerLiu Aleaxander <Aleaxander@gmail.com>2009-08-08 17:49:48 +0800
commita0a603145eaf41c0650dd9c80002375c8b2cb04f (patch)
tree12e31617f96837a46a2beaac90da91fd138f65ad
parent363bb72fd5fa66efeadb03e123ecd99b1a381126 (diff)
downloadsyslinux-a0a603145eaf41c0650dd9c80002375c8b2cb04f.tar.gz
Core: code-clean
removes the unused variables and functions Signed-off-by: Liu Aleaxander <Aleaxander@gmail.com>
-rw-r--r--core/fat.c2
-rw-r--r--core/iso9660.c31
-rw-r--r--core/pxe.c5
3 files changed, 3 insertions, 35 deletions
diff --git a/core/fat.c b/core/fat.c
index 9fb0f3c5..c84d6c92 100644
--- a/core/fat.c
+++ b/core/fat.c
@@ -35,8 +35,6 @@ static sector_t DataArea; /* Location of data area */
static uint32_t TotalSectors; /* Total number of sectors */
static uint32_t ClustSize; /* Bytes/cluster */
static uint32_t ClustMask; /* Sector/cluster - 1 */
-static uint8_t CopySuper; /* Distinguish .bs versus .bss */
-static uint8_t DriveNumber; /* BIOS drive number */
static uint8_t ClustShift; /* Shift count for sectors/cluster */
static uint8_t ClustByteShift; /* Shift count for bytes/cluster */
diff --git a/core/iso9660.c b/core/iso9660.c
index 03beb466..61179c3f 100644
--- a/core/iso9660.c
+++ b/core/iso9660.c
@@ -33,7 +33,6 @@ static struct dir_t RootDir;
static struct dir_t CurrentDir;
static uint16_t BufSafe = TRACKBUF_SIZE >> ISO_SECTOR_SHIFT;
-static uint16_t BufSafeBytes = TRACKBUF_SIZE;
static char ISOFileName[64]; /* ISO filename canonicalizatin buffer */
static char *ISOFileNameEnd = &ISOFileName[64];
@@ -79,34 +78,6 @@ static void close_file(struct open_file_t *file)
file->file_sector = 0;
}
-static void getlinsec_cdrom(char *buf, sector_t sector_num, int sectors)
-{
- com32sys_t regs;
- //static __lowmem char low_buf[65536];
- /* for safe, we use buf + (sectors << SECTOR_SHIFT) here */
- int high_addr = (buf + (sectors << ISO_SECTOR_SHIFT)) > (char *)0x100000;
-
- memset(&regs, 0, sizeof regs);
- regs.eax.l = sector_num;
- regs.ebp.l = sectors;
-
- if (high_addr) {
- regs.es = SEG(core_xfer_buf);
- regs.ebx.w[0] = OFFS(core_xfer_buf);
- } else {
- regs.es = SEG(buf);
- regs.ebx.w[0] = OFFS(buf);
- }
-
- call16(getlinsec, &regs, NULL);
-
- if (high_addr)
- memcpy(buf, core_xfer_buf, sectors << ISO_SECTOR_SHIFT);
-}
-
-
-
-
/**
* mangle_name:
*
@@ -437,7 +408,7 @@ static void iso_searchdir(char *filename, struct file *file)
{
struct open_file_t *open_file = NULL;
struct dir_t *dir;
- uint32_t file_len;
+ uint32_t file_len = 0;
int ret;
void *res;
diff --git a/core/pxe.c b/core/pxe.c
index aea1691f..12c3113e 100644
--- a/core/pxe.c
+++ b/core/pxe.c
@@ -18,8 +18,6 @@
static char *err_nopxe = "No !PXE or PXENV+ API found; we're dead...\n";
static char *err_pxefailed = "PXE API call failed, error ";
static char *err_udpinit = "Failed to initialize UDP stack\n";
-static char *err_noconfig = "Unable to locate configuration file\n";
-static char *err_damage = "TFTP server sent an incomprehesible reply\n";
static char *tftpprefix_msg = "TFTP prefix: ";
static char *get_packet_msg = "Getting cached packet ";
@@ -1159,7 +1157,8 @@ static void pxe_load_config(com32sys_t *regs)
if (try_load(regs))
return;
- /* call16(no_config, NULL, NULL); */
+ printf("Unable to locate configuration file\n");
+ call16(kaboom, NULL, NULL);
}