Deleted Added
full compact
devicename.c (332154) devicename.c (344377)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@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

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

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
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: stable/11/stand/i386/libi386/devicename.c 332154 2018-04-06 21:37:25Z kevans $");
28__FBSDID("$FreeBSD: stable/11/stand/i386/libi386/devicename.c 344377 2019-02-20 19:13:09Z kevans $");
29
30#include <stand.h>
31#include <string.h>
32#include "bootstrap.h"
33#include "disk.h"
34#include "libi386.h"
29
30#include <stand.h>
31#include <string.h>
32#include "bootstrap.h"
33#include "disk.h"
34#include "libi386.h"
35#include "../zfs/libzfs.h"
35#include "libzfs.h"
36
37static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path);
38
39/*
40 * Point (dev) at an allocated device specifier for the device matching the
41 * path in (devspec). If it contains an explicit device specification,
42 * use that. If not, use the default device.
43 */

--- 162 unchanged lines hidden ---
36
37static int i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path);
38
39/*
40 * Point (dev) at an allocated device specifier for the device matching the
41 * path in (devspec). If it contains an explicit device specification,
42 * use that. If not, use the default device.
43 */

--- 162 unchanged lines hidden ---