Deleted Added
full compact
mkimg.h (266176) mkimg.h (268236)
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 2014 Juniper Networks, Inc.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $FreeBSD: head/usr.bin/mkimg/mkimg.h 266176 2014-05-15 19:19:57Z marcel $
26 * $FreeBSD: head/usr.bin/mkimg/mkimg.h 268236 2014-07-03 20:31:43Z marcel $
27 */
28
29#ifndef _MKIMG_MKIMG_H_
30#define _MKIMG_MKIMG_H_
31
32#include <sys/queue.h>
33
34struct part {

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

45 lba_t block; /* Block-offset of partition in image. */
46 lba_t size; /* Size in blocks of partition. */
47 char *label; /* Partition label. */
48};
49
50extern STAILQ_HEAD(partlisthead, part) partlist;
51extern u_int nparts;
52
27 */
28
29#ifndef _MKIMG_MKIMG_H_
30#define _MKIMG_MKIMG_H_
31
32#include <sys/queue.h>
33
34struct part {

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

45 lba_t block; /* Block-offset of partition in image. */
46 lba_t size; /* Size in blocks of partition. */
47 char *label; /* Partition label. */
48};
49
50extern STAILQ_HEAD(partlisthead, part) partlist;
51extern u_int nparts;
52
53extern u_int unit_testing;
53extern u_int verbose;
54
55extern u_int ncyls;
56extern u_int nheads;
57extern u_int nsecs;
58extern u_int secsz; /* Logical block size. */
59extern u_int blksz; /* Physical block size. */
60

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

66}
67
68#if !defined(SPARSE_WRITE)
69#define sparse_write write
70#else
71ssize_t sparse_write(int, const void *, size_t);
72#endif
73
54extern u_int verbose;
55
56extern u_int ncyls;
57extern u_int nheads;
58extern u_int nsecs;
59extern u_int secsz; /* Logical block size. */
60extern u_int blksz; /* Physical block size. */
61

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

67}
68
69#if !defined(SPARSE_WRITE)
70#define sparse_write write
71#else
72ssize_t sparse_write(int, const void *, size_t);
73#endif
74
75struct uuid;
76void mkimg_uuid(struct uuid *);
77
74#endif /* _MKIMG_MKIMG_H_ */
78#endif /* _MKIMG_MKIMG_H_ */