[syslinux:pathbased] installers: fix warnings
syslinux-bot for H. Peter Anvin
hpa at linux.intel.com
Wed May 12 16:12:17 PDT 2010
Commit-ID: d7eb569f092913018934dc702ba22af295557cc9
Gitweb: http://syslinux.zytor.com/commit/d7eb569f092913018934dc702ba22af295557cc9
Author: H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Wed, 12 May 2010 16:06:10 -0700
Committer: H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Wed, 12 May 2010 16:06:10 -0700
installers: fix warnings
CLean up warnings in the installers.
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
---
extlinux/main.c | 2 ++
libinstaller/syslxmod.c | 5 +++--
linux/syslinux.c | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/extlinux/main.c b/extlinux/main.c
index e1d5596..dea2d19 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 0285bb4..e18d8a6 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 0232377..0ac9de9 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;
More information about the Syslinux-commits
mailing list