summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrediano Ziglio <frediano.ziglio@citrix.com>2012-08-02 09:30:04 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-09 14:13:07 +0100
commit3862b19dcc6de2a2653bb9fbe4c6ad4f062d9714 (patch)
treed827294a4bb37e56cd4d37ed77558c974e73ec2c
parentb0d5575ded49de084d1abdef3ab66b4c05d9bca9 (diff)
downloadsyslinux-3862b19dcc6de2a2653bb9fbe4c6ad4f062d9714.tar.gz
make some functions static remove unused NADV define
Just some minor cleanup Signed-off-by: Frediano Ziglio <frediano.ziglio@citrix.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
-rw-r--r--extlinux/main.c8
-rw-r--r--libinstaller/syslxmod.c2
2 files changed, 4 insertions, 6 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index 73f3fbe1..f0d8e11b 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 24368459..c706f2c2 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)