path: root/extlinux
diff options
authorMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-10-24 14:41:00 +0100
commita7115d314dda45324baccee6898a561ed253c8e1 (patch)
tree02db40f456aa512205e06480611da3569692afef /extlinux
parentc5d8c3f1676afb21cc9f780b6161eaaab35730fc (diff)
parent7307d60063ee4303da4de45f9d984fdc8df92146 (diff)
Merge branch 'master' into elflink
The following conflict is a result of the fact comapi_chainboot was only stubbed out on the 'elflink' branch but was properly marked as obsolete in 'master'. Conflicts: core/comboot.inc
Diffstat (limited to 'extlinux')
1 files changed, 4 insertions, 4 deletions
diff --git a/extlinux/main.c b/extlinux/main.c
index d1a90481..611b8080 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;
@@ -796,7 +796,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);
@@ -1226,7 +1226,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;