summaryrefslogtreecommitdiff
path: root/sbin/badsect/badsect.c
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2013-06-11 16:42:20 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2013-06-11 16:42:20 +0000
commit6b46236c83f9aa5b9cd59b466eeba348ee23825a (patch)
treeef7eca8601ed03d00b5a9a53b3355f66ed478486 /sbin/badsect/badsect.c
parentcc20036a151815396b8c4285e8b3b56f0172f1d5 (diff)
final removal of daddr64_t. daddr_t has been 64 bit for a long enough
test period; i think 3 years ago the last bugs fell out. ok otto beck others
Diffstat (limited to 'sbin/badsect/badsect.c')
-rw-r--r--sbin/badsect/badsect.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sbin/badsect/badsect.c b/sbin/badsect/badsect.c
index 5a61c3cc099..4c9f54b87bd 100644
--- a/sbin/badsect/badsect.c
+++ b/sbin/badsect/badsect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: badsect.c,v 1.20 2013/06/02 06:22:29 guenther Exp $ */
+/* $OpenBSD: badsect.c,v 1.21 2013/06/11 16:42:02 deraadt Exp $ */
/* $NetBSD: badsect.c,v 1.10 1995/03/18 14:54:28 cgd Exp $ */
/*
@@ -55,8 +55,8 @@
#include <unistd.h>
#include <err.h>
-static int chkuse(daddr64_t, int);
-static void rdfs(daddr64_t, int, char *);
+static int chkuse(daddr_t, int);
+static void rdfs(daddr_t, int, char *);
static union {
struct fs fs;
@@ -76,7 +76,7 @@ static long dev_bsize = 1;
int
main(int argc, char *argv[])
{
- daddr64_t number;
+ daddr_t number;
struct stat stbuf, devstat;
struct dirent *dp;
DIR *dirp;
@@ -140,10 +140,10 @@ main(int argc, char *argv[])
}
static int
-chkuse(daddr64_t blkno, int cnt)
+chkuse(daddr_t blkno, int cnt)
{
int cg;
- daddr64_t fsbn, bn;
+ daddr_t fsbn, bn;
fsbn = dbtofsb(fs, blkno);
if (fsbn+cnt > fs->fs_ffs1_size) {
@@ -181,7 +181,7 @@ chkuse(daddr64_t blkno, int cnt)
* read a block from the file system
*/
static void
-rdfs(daddr64_t bno, int size, char *bf)
+rdfs(daddr_t bno, int size, char *bf)
{
int n;