Syslinux - Aug 2012 - [PATCH] make some functions static remove unused NADV define

Just some minor cleanup

Signed-off-by: Frediano Ziglio <frediano.ziglio at citrix.com>
---
 extlinux/main.c         |    8 ++++----
 libinstaller/syslxmod.c |    2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/extlinux/main.c b/extlinux/main.c
index 73f3fbe..f0d8e11 100644
--- a/extlinux/main.c
+++ b/extlinux/main.c
@@ -76,7 +76,7 @@ static char subvol[BTRFS_SUBVOL_MAX];
 /*
  * Get the size of a block device
  */
-uint64_t get_size(int devfd)
+static uint64_t get_size(int devfd)
 {
     uint64_t bytes;
     uint32_t sects;
@@ -210,7 +210,7 @@ ok:
  *
  * Returns the number of modified bytes in the boot file.
  */
-int patch_file_and_bootblock(int fd, const char *dir, int devfd)
+static int patch_file_and_bootblock(int fd, const char *dir, int devfd)
 {
     struct stat dirst, xdst;
     struct hd_geometry geo;
@@ -746,7 +746,7 @@ static char * get_default_subvol(char * rootdir,
char * subvol)
    return subvol;
 }
 
-int install_file(const char *path, int devfd, struct stat *rst)
+static int install_file(const char *path, int devfd, struct stat *rst)
 {
 	if (fs_type == EXT2 || fs_type == VFAT || fs_type == NTFS)
 		return ext2_fat_install_file(path, devfd, rst);
@@ -1174,7 +1174,7 @@ static int ext_write_adv(const char *path, const
char *cfg, int devfd)
     return write_adv(path, cfg);
 }
 
-int install_loader(const char *path, int update_only)
+static int install_loader(const char *path, int update_only)
 {
     struct stat st, fst;
     int devfd, rv;
diff --git a/libinstaller/syslxmod.c b/libinstaller/syslxmod.c
index 2436845..c706f2c 100644
--- a/libinstaller/syslxmod.c
+++ b/libinstaller/syslxmod.c
@@ -96,8 +96,6 @@ static inline void *ptr(void *img, uint16_t *offset_p)
  * Returns the number of modified bytes in ldlinux.sys if successful,
  * otherwise -1.
  */
-#define NADV 2
-
 int syslinux_patch(const sector_t *sectp, int nsectors,
 		   int stupid, int raid_mode,
 		   const char *subdir, const char *subvol)
-- 
1.7.5.4

On Thu, 2012-08-02 at 09:30 +0100, Frediano Ziglio
wrote:
> Just some minor cleanup
> 
> Signed-off-by: Frediano Ziglio <frediano.ziglio at citrix.com>
> ---
>  extlinux/main.c         |    8 ++++----
>  libinstaller/syslxmod.c |    2 --
>  2 files changed, 4 insertions(+), 6 deletions(-)
Applied, thanks.

-- 
Matt Fleming, Intel Open Source Technology Center