aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@linux.intel.com>2010-05-12 16:06:10 -0700
committerH. Peter Anvin <hpa@linux.intel.com>2010-05-12 16:06:10 -0700
commitd7eb569f092913018934dc702ba22af295557cc9 (patch)
tree2d8985035c9d1acbeaa8ff7b9cc6788537009d0e
parent8f1d81dd38e7cd49b686a9fd16d056fdd818b687 (diff)
downloadsyslinux-d7eb569f092913018934dc702ba22af295557cc9.tar.gz
syslinux-d7eb569f092913018934dc702ba22af295557cc9.tar.xz
syslinux-d7eb569f092913018934dc702ba22af295557cc9.zip
installers: fix warnings
CLean up warnings in the installers. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r--extlinux/main.c2
-rw-r--r--libinstaller/syslxmod.c5
-rw-r--r--linux/syslinux.c2
3 files changed, 6 insertions, 3 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index e1d55964..dea2d198 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -1014,6 +1014,8 @@ static const char *find_device(const char *mtab_file, dev_t dev)
done = true;
break;
}
+ case NONE:
+ break;
}
if (done) {
devname = strdup(mnt->mnt_fsname);
diff --git a/libinstaller/syslxmod.c b/libinstaller/syslxmod.c
index 0285bb41..e18d8a69 100644
--- a/libinstaller/syslxmod.c
+++ b/libinstaller/syslxmod.c
@@ -25,11 +25,11 @@
#include "syslinux.h"
#include "syslxint.h"
-#define sbs ((struct boot_sector *)syslinux_bootsect)
-
void syslinux_make_bootsect(void *bs)
{
struct boot_sector *bootsect = bs;
+ const struct boot_sector *sbs =
+ (const struct boot_sector *)syslinux_bootsect;
memcpy(&bootsect->bsHead, &sbs->bsHead, bsHeadLen);
memcpy(&bootsect->bsCode, &sbs->bsCode, bsCodeLen);
@@ -234,6 +234,7 @@ int syslinux_patch(const uint32_t * sectors, int nsectors,
int nsect = (syslinux_ldlinux_len + 511) >> 9;
uint32_t csum;
int i, dw, nptrs, rv;
+ struct boot_sector *sbs = (struct boot_sector *)syslinux_bootsect;
if (nsectors < nsect)
return -1;
diff --git a/linux/syslinux.c b/linux/syslinux.c
index 02323771..0ac9de92 100644
--- a/linux/syslinux.c
+++ b/linux/syslinux.c
@@ -329,7 +329,7 @@ int main(int argc, char *argv[])
char mntname[128];
char *ldlinux_name, **argp, *opt;
const char *subdir = NULL;
- uint32_t *sectors;
+ uint32_t *sectors = NULL;
int ldlinux_sectors;
int nsectors = 0;
const char *errmsg;