Deleted Added
full compact
geom.h (155175) geom.h (162867)
1/*-
2 * Copyright (c) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
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) 2004 Pawel Jakub Dawidek <pjd@FreeBSD.org>
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/sbin/geom/core/geom.h 155175 2006-02-01 12:11:37Z pjd $
26 * $FreeBSD: head/sbin/geom/core/geom.h 162867 2006-09-30 14:39:18Z pjd $
27 */
28
29#ifndef _GEOM_H_
30#define _GEOM_H_
27 */
28
29#ifndef _GEOM_H_
30#define _GEOM_H_
31#define G_LIB_VERSION 1
31#define G_LIB_VERSION 2
32
33#define G_FLAG_NONE 0x0000
34#define G_FLAG_VERBOSE 0x0001
35#define G_FLAG_LOADKLD 0x0002
36
32
33#define G_FLAG_NONE 0x0000
34#define G_FLAG_VERBOSE 0x0001
35#define G_FLAG_LOADKLD 0x0002
36
37#define G_TYPE_NONE 0
38#define G_TYPE_STRING 1
39#define G_TYPE_NUMBER 2
37#define G_TYPE_NONE 0x00
38#define G_TYPE_BOOL 0x01
39#define G_TYPE_STRING 0x02
40#define G_TYPE_NUMBER 0x03
41#define G_TYPE_MASK 0x03
42#define G_TYPE_DONE 0x10
40
41#define G_OPT_MAX 16
43
44#define G_OPT_MAX 16
42#define G_OPT_DONE(opt) (opt)->go_char = '\0'
43#define G_OPT_ISDONE(opt) ((opt)->go_char == '\0')
45#define G_OPT_DONE(opt) do { (opt)->go_type |= G_TYPE_DONE; } while (0)
46#define G_OPT_ISDONE(opt) ((opt)->go_type & G_TYPE_DONE)
47#define G_OPT_TYPE(opt) ((opt)->go_type & G_TYPE_MASK)
44
45#define G_OPT_SENTINEL { '\0', NULL, NULL, G_TYPE_NONE }
46#define G_NULL_OPTS { G_OPT_SENTINEL }
47#define G_CMD_SENTINEL { NULL, 0, NULL, G_NULL_OPTS, NULL }
48
49struct g_option {
50 char go_char;
51 const char *go_name;

--- 12 unchanged lines hidden ---
48
49#define G_OPT_SENTINEL { '\0', NULL, NULL, G_TYPE_NONE }
50#define G_NULL_OPTS { G_OPT_SENTINEL }
51#define G_CMD_SENTINEL { NULL, 0, NULL, G_NULL_OPTS, NULL }
52
53struct g_option {
54 char go_char;
55 const char *go_name;

--- 12 unchanged lines hidden ---