[syslinux:pathbased] Clean up warnings in previous checkin

syslinux-bot for H. Peter Anvin hpa at linux.intel.com
Wed Jun 9 17:48:04 PDT 2010


Commit-ID:  95c91f42886abdd9af08cbed66b50dd37eb555dc
Gitweb:     http://syslinux.zytor.com/commit/95c91f42886abdd9af08cbed66b50dd37eb555dc
Author:     H. Peter Anvin <hpa at linux.intel.com>
AuthorDate: Wed, 9 Jun 2010 11:20:41 -0700
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Wed, 9 Jun 2010 11:20:41 -0700

Clean up warnings in previous checkin

Clean up warnings in checkin
146c34a2 Make syslinux installer real "pathbased"

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


---
 extlinux/main.c         |    5 +++++
 libinstaller/syslxmod.c |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/extlinux/main.c b/extlinux/main.c
index 8a0ac63..e33e3ae 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -82,11 +82,14 @@ typedef uint64_t u64;
 #define BTRFS_SUBVOL_OPT "subvol="
 #define BTRFS_SUBVOL_MAX 256	/* By btrfs specification */
 static char subvol[BTRFS_SUBVOL_MAX];
+
 /*
  * Boot block
  */
 extern unsigned char extlinux_bootsect[];
 extern unsigned int extlinux_bootsect_len;
+#undef  boot_block
+#undef  boot_block_len
 #define boot_block	extlinux_bootsect
 #define boot_block_len  extlinux_bootsect_len
 
@@ -95,6 +98,8 @@ extern unsigned int extlinux_bootsect_len;
  */
 extern unsigned char extlinux_image[];
 extern unsigned int extlinux_image_len;
+#undef  boot_image
+#undef  boot_image_len
 #define boot_image	extlinux_image
 #define boot_image_len  extlinux_image_len
 
diff --git a/libinstaller/syslxmod.c b/libinstaller/syslxmod.c
index b28a443..96f155f 100644
--- a/libinstaller/syslxmod.c
+++ b/libinstaller/syslxmod.c
@@ -21,6 +21,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <stddef.h>
+#include <stdlib.h>
 
 #include "syslinux.h"
 #include "syslxint.h"
@@ -233,9 +234,9 @@ int syslinux_patch(const uint32_t * sectors, int nsectors,
     uint32_t *wp;
     int nsect = (boot_image_len + 511) >> 9;
     uint32_t csum;
-    int i, dw, nptrs, rv;
+    int i, dw, nptrs;
     struct boot_sector *sbs = (struct boot_sector *)boot_sector;
-    int diroffset, dirlen;
+    size_t diroffset, dirlen;
 
     if (nsectors < nsect)
 	return -1;



More information about the Syslinux-commits mailing list