Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
lukem 1997-09-16 03:13:18 +00:00
parent 8a293e132a
commit ea2eef1424
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.sbin/dumpfs/dumpfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: dumpfs.c,v 1.12 1997/04/26 05:41:33 lukem Exp $ */
/* $NetBSD: dumpfs.c,v 1.13 1997/09/16 03:13:18 lukem Exp $ */
/*
* Copyright (c) 1983, 1992, 1993
@ -41,9 +41,9 @@ static char copyright[] =
#ifndef lint
#if 0
static char sccsid[] = "@(#)dumpfs.c 8.2 (Berkeley) 2/2/94";
static char sccsid[] = "@(#)dumpfs.c 8.5 (Berkeley) 4/29/95";
#else
static char rcsid[] = "$NetBSD: dumpfs.c,v 1.12 1997/04/26 05:41:33 lukem Exp $";
static char rcsid[] = "$NetBSD: dumpfs.c,v 1.13 1997/09/16 03:13:18 lukem Exp $";
#endif
#endif /* not lint */
@ -123,9 +123,8 @@ dumpfs(name)
goto err;
if (afs.fs_magic != FS_MAGIC) {
warnx("%s: superblock has bad magic number, skipping.",
name);
(void) close(fd);
warnx("%s: superblock has bad magic number, skipped", name);
(void)close(fd);
return (1);
}