Deleted Added
sdiff udiff text old ( 101687 ) new ( 105737 )
full compact
type.c (101687) type.c (105737)
1/*
2 * Copyright (c) 2002 Juli Mallett. All rights reserved.
3 *
4 * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
5 * FreeBSD project. Redistribution and use in source and binary forms, with
6 * or without modification, are permitted provided that the following
7 * conditions are met:
8 *

--- 12 unchanged lines hidden (view full) ---

21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*
2 * Copyright (c) 2002 Juli Mallett. All rights reserved.
3 *
4 * This software was written by Juli Mallett <jmallett@FreeBSD.org> for the
5 * FreeBSD project. Redistribution and use in source and binary forms, with
6 * or without modification, are permitted provided that the following
7 * conditions are met:
8 *

--- 12 unchanged lines hidden (view full) ---

21 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/lib/libufs/type.c 101687 2002-08-11 15:37:10Z jmallett $");
29__FBSDID("$FreeBSD: head/lib/libufs/type.c 105737 2002-10-22 19:25:58Z jmallett $");
30
31#include <sys/param.h>
32#include <sys/mount.h>
33#include <sys/disklabel.h>
34#include <sys/stat.h>
35
36#include <ufs/ufs/ufsmount.h>
37#include <ufs/ufs/dinode.h>

--- 56 unchanged lines hidden (view full) ---

94{
95 int fd;
96
97 DEBUG(NULL);
98
99 fd = open(name, O_RDONLY);
100 if (fd == -1) {
101 DEBUG("open");
30
31#include <sys/param.h>
32#include <sys/mount.h>
33#include <sys/disklabel.h>
34#include <sys/stat.h>
35
36#include <ufs/ufs/ufsmount.h>
37#include <ufs/ufs/dinode.h>

--- 56 unchanged lines hidden (view full) ---

94{
95 int fd;
96
97 DEBUG(NULL);
98
99 fd = open(name, O_RDONLY);
100 if (fd == -1) {
101 DEBUG("open");
102 disk->d_error = "failed to open disk for reading";
102 return -1;
103 }
104
105 disk->d_bsize = 1;
106 disk->d_fd = fd;
107 disk->d_inoblock = NULL;
108 disk->d_inomin = 0;
109 disk->d_inomax = 0;
110 disk->d_name = name;
111 disk->d_ufs = 0;
103 return -1;
104 }
105
106 disk->d_bsize = 1;
107 disk->d_fd = fd;
108 disk->d_inoblock = NULL;
109 disk->d_inomin = 0;
110 disk->d_inomax = 0;
111 disk->d_name = name;
112 disk->d_ufs = 0;
113 disk->d_error = NULL;
112
113 if (sbread(disk) == -1) {
114 DEBUG(NULL);
115 return -1;
116 }
117
118 return 0;
119}
114
115 if (sbread(disk) == -1) {
116 DEBUG(NULL);
117 return -1;
118 }
119
120 return 0;
121}