summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
Diffstat (limited to 'sbin')
-rw-r--r--sbin/fsck_ext2fs/inode.c6
-rw-r--r--sbin/fsck_ffs/inode.c6
-rw-r--r--sbin/fsdb/fsdb.c6
-rw-r--r--sbin/mount_portal/pt_file.c4
4 files changed, 11 insertions, 11 deletions
diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c
index 8d2ca2f891b..48c0c3fc803 100644
--- a/sbin/fsck_ext2fs/inode.c
+++ b/sbin/fsck_ext2fs/inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inode.c,v 1.4 1997/06/25 18:40:40 kstailey Exp $ */
+/* $OpenBSD: inode.c,v 1.5 1999/08/06 20:41:05 deraadt Exp $ */
/* $NetBSD: inode.c,v 1.1 1997/06/11 11:21:49 bouyer Exp $ */
/*
@@ -42,7 +42,7 @@ static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95";
#if 0
static char rcsid[] = "$NetBSD: inode.c,v 1.1 1997/06/11 11:21:49 bouyer Exp $";
#else
-static char rcsid[] = "$OpenBSD: inode.c,v 1.4 1997/06/25 18:40:40 kstailey Exp $";
+static char rcsid[] = "$OpenBSD: inode.c,v 1.5 1999/08/06 20:41:05 deraadt Exp $";
#endif
#endif
#endif /* not lint */
@@ -535,7 +535,7 @@ pinode(ino)
dp = ginode(ino);
printf(" OWNER=");
#ifndef SMALL
- if ((pw = getpwuid((int)dp->e2di_uid)) != 0)
+ if ((pw = getpwuid(dp->e2di_uid)) != 0)
printf("%s ", pw->pw_name);
else
#endif
diff --git a/sbin/fsck_ffs/inode.c b/sbin/fsck_ffs/inode.c
index cabe02a368e..ef613b4ed52 100644
--- a/sbin/fsck_ffs/inode.c
+++ b/sbin/fsck_ffs/inode.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inode.c,v 1.13 1997/10/11 20:19:36 niklas Exp $ */
+/* $OpenBSD: inode.c,v 1.14 1999/08/06 20:41:06 deraadt Exp $ */
/* $NetBSD: inode.c,v 1.23 1996/10/11 20:15:47 thorpej Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)inode.c 8.5 (Berkeley) 2/8/95";
#else
-static char rcsid[] = "$OpenBSD: inode.c,v 1.13 1997/10/11 20:19:36 niklas Exp $";
+static char rcsid[] = "$OpenBSD: inode.c,v 1.14 1999/08/06 20:41:06 deraadt Exp $";
#endif
#endif /* not lint */
@@ -520,7 +520,7 @@ pinode(ino)
dp = ginode(ino);
printf(" OWNER=");
#ifndef SMALL
- if ((pw = getpwuid((int)dp->di_uid)) != 0)
+ if ((pw = getpwuid(dp->di_uid)) != 0)
printf("%s ", pw->pw_name);
else
#endif
diff --git a/sbin/fsdb/fsdb.c b/sbin/fsdb/fsdb.c
index 1ba03e1a138..762ad52c5ea 100644
--- a/sbin/fsdb/fsdb.c
+++ b/sbin/fsdb/fsdb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fsdb.c,v 1.6 1999/05/19 03:17:15 alex Exp $ */
+/* $OpenBSD: fsdb.c,v 1.7 1999/08/06 20:41:06 deraadt Exp $ */
/* $NetBSD: fsdb.c,v 1.7 1997/01/11 06:50:53 lukem Exp $ */
/*-
@@ -766,7 +766,7 @@ CMDFUNCSTART(linkcount)
CMDFUNCSTART(chowner)
{
int rval = 1;
- unsigned long uid;
+ uid_t uid;
char *cp;
struct passwd *pwd;
@@ -793,7 +793,7 @@ CMDFUNCSTART(chowner)
CMDFUNCSTART(chgroup)
{
int rval = 1;
- unsigned long gid;
+ gid_t gid;
char *cp;
struct group *grp;
diff --git a/sbin/mount_portal/pt_file.c b/sbin/mount_portal/pt_file.c
index f0a6932505b..56edb089068 100644
--- a/sbin/mount_portal/pt_file.c
+++ b/sbin/mount_portal/pt_file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pt_file.c,v 1.6 1998/08/07 01:31:46 csapuntz Exp $ */
+/* $OpenBSD: pt_file.c,v 1.7 1999/08/06 20:41:06 deraadt Exp $ */
/* $NetBSD: pt_file.c,v 1.7 1995/06/06 19:54:30 mycroft Exp $ */
/*
@@ -70,7 +70,7 @@ portal_file(pcr, key, v, so, fdp)
pbuf[sizeof pbuf-1] = '\0';
#ifdef DEBUG
- (void)printf("path = %s, uid = %d, gid = %d\n", pbuf, pcr->pcr_uid,
+ (void)printf("path = %s, uid = %u, gid = %u\n", pbuf, pcr->pcr_uid,
pcr->pcr_gid);
#endif