summaryrefslogtreecommitdiff
path: root/sys/arch/i386
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-07-03 19:21:49 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-07-03 19:21:49 +0000
commite6caee1842efde93c3f8fd1ead5aab263999015c (patch)
tree98f6eedeb771c6fed6bceea67051d30d58d3d844 /sys/arch/i386
parent051b94109a7c527f73f6f30405f2fe393efc172a (diff)
Change name of pointer to partition from pl to pp, as is used everywhere else, No
functional change.
Diffstat (limited to 'sys/arch/i386')
-rw-r--r--sys/arch/i386/stand/installboot/installboot.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/i386/stand/installboot/installboot.c b/sys/arch/i386/stand/installboot/installboot.c
index 5ac896d5680..3d88a929471 100644
--- a/sys/arch/i386/stand/installboot/installboot.c
+++ b/sys/arch/i386/stand/installboot/installboot.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: installboot.c,v 1.62 2011/04/24 22:44:22 krw Exp $ */
+/* $OpenBSD: installboot.c,v 1.63 2011/07/03 19:21:48 krw Exp $ */
/* $NetBSD: installboot.c,v 1.5 1995/11/17 23:23:50 gwr Exp $ */
/*
@@ -407,7 +407,7 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
int fd;
struct stat statbuf, sb;
struct statfs statfsbuf;
- struct partition *pl;
+ struct partition *pp;
struct fs *fs;
char *buf;
u_int blk, *ap;
@@ -469,11 +469,11 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
errx(1, "cross-device install");
}
- pl = &dl->d_partitions[DISKPART(statbuf.st_dev)];
+ pp = &dl->d_partitions[DISKPART(statbuf.st_dev)];
close(fd);
/* Read superblock. */
- devread(devfd, sblock, pl->p_offset + SBLOCK, SBSIZE, "superblock");
+ devread(devfd, sblock, pp->p_offset + SBLOCK, SBSIZE, "superblock");
fs = (struct fs *)sblock;
/* Sanity-check super-block. */
@@ -488,7 +488,7 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
blk = fsbtodb(fs, ino_to_fsba(fs, statbuf.st_ino));
- devread(devfd, buf, pl->p_offset + blk, fs->fs_bsize, "inode");
+ devread(devfd, buf, pp->p_offset + blk, fs->fs_bsize, "inode");
ip = (struct ufs1_dinode *)(buf) + ino_to_fsbo(fs, statbuf.st_ino);
/*
@@ -506,7 +506,7 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
sym_set_value(pbr_symbols, "_fs_bsize_p", (fs->fs_bsize / 16));
sym_set_value(pbr_symbols, "_fs_bsize_s", (fs->fs_bsize / 512));
sym_set_value(pbr_symbols, "_fsbtodb", fs->fs_fsbtodb);
- sym_set_value(pbr_symbols, "_p_offset", pl->p_offset);
+ sym_set_value(pbr_symbols, "_p_offset", pp->p_offset);
sym_set_value(pbr_symbols, "_inodeblk",
ino_to_fsba(fs, statbuf.st_ino));
ap = ip->di_db;
@@ -519,7 +519,7 @@ getbootparams(char *boot, int devfd, struct disklabel *dl)
boot, ndb, fs->fs_bsize);
fprintf(stderr, "fs block shift %u; part offset %u; "
"inode block %lld, offset %ld\n",
- fs->fs_fsbtodb, pl->p_offset,
+ fs->fs_fsbtodb, pp->p_offset,
ino_to_fsba(fs, statbuf.st_ino),
((((char *)ap) - buf) + INODEOFF));
}