From 9dea6e96bcb32b622dcc692daabeb82b86929853 Mon Sep 17 00:00:00 2001 From: Ben Gras Date: Tue, 15 Nov 2005 12:12:00 +0000 Subject: [PATCH] Updated constant names --- boot/installboot.c | 6 +++--- boot/rawfs.c | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/boot/installboot.c b/boot/installboot.c index b0ca9a894..4b8ae4a61 100755 --- a/boot/installboot.c +++ b/boot/installboot.c @@ -367,7 +367,7 @@ int raw_install(char *file, off_t *start, off_t *len, int block_size) * Note: *len == 0 when an image is read. It is set right afterwards. */ { - static char buf[MAX_BLOCK_SIZE]; /* Nonvolatile block buffer. */ + static char buf[_MAX_BLOCK_SIZE]; /* Nonvolatile block buffer. */ FILE *f; off_t sec; unsigned long devsize; @@ -424,7 +424,7 @@ void make_bootable(enum howto how, char *device, char *bootblock, * vector are added to the end of the device. */ { - char buf[MAX_BLOCK_SIZE + 256], *adrp, *parmp; + char buf[_MAX_BLOCK_SIZE + 256], *adrp, *parmp; struct fileaddr { off_t address; int count; @@ -695,7 +695,7 @@ void install_master(char *device, char *masterboot, char **guide) FILE *masf; unsigned long size; struct stat st; - static char buf[MAX_BLOCK_SIZE]; + static char buf[_MAX_BLOCK_SIZE]; /* Open device. */ if ((rawfd= open(rawdev= device, O_RDWR)) < 0) fatal(device); diff --git a/boot/rawfs.c b/boot/rawfs.c index baa720cf7..f90e8e29c 100755 --- a/boot/rawfs.c +++ b/boot/rawfs.c @@ -53,9 +53,9 @@ static struct super_block super; /* Superblock of file system */ #endif static struct inode curfil; /* Inode of file under examination */ -static char indir[MAX_BLOCK_SIZE]; /* Single indirect block. */ -static char dindir[MAX_BLOCK_SIZE]; /* Double indirect block. */ -static char dirbuf[MAX_BLOCK_SIZE]; /* Scratch/Directory block. */ +static char indir[_MAX_BLOCK_SIZE]; /* Single indirect block. */ +static char dindir[_MAX_BLOCK_SIZE]; /* Double indirect block. */ +static char dirbuf[_MAX_BLOCK_SIZE]; /* Scratch/Directory block. */ #define scratch dirbuf static block_t a_indir, a_dindir; /* Addresses of the indirects. */ @@ -83,8 +83,8 @@ off_t r_super(int *bs) if(super.s_magic == SUPER_V2) super.s_block_size = 1024; *bs = block_size = super.s_block_size; - if(block_size < MIN_BLOCK_SIZE || - block_size > MAX_BLOCK_SIZE) { + if(block_size < _MIN_BLOCK_SIZE || + block_size > _MAX_BLOCK_SIZE) { return 0; } nr_dzones= V2_NR_DZONES;