Deleted Added
full compact
geom_xml2tree.c (280687) geom_xml2tree.c (281875)
1/*-
2 * Copyright (c) 2003 Poul-Henning Kamp
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

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
1/*-
2 * Copyright (c) 2003 Poul-Henning Kamp
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

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

21 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
22 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
23 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
24 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
25 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
26 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE.
28 *
29 * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 280687 2015-03-26 12:17:47Z mav $
29 * $FreeBSD: head/lib/libgeom/geom_xml2tree.c 281875 2015-04-22 22:23:56Z pfg $
30 */
31
32#include <stdio.h>
33#include <inttypes.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>
37#include <errno.h>

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

252 if (!strcmp(name, "stripeoffset") && mt->provider != NULL) {
253 mt->provider->lg_stripeoffset = strtoumax(p, NULL, 0);
254 free(p);
255 return;
256 }
257
258 if (!strcmp(name, "config")) {
259 mt->config = NULL;
30 */
31
32#include <stdio.h>
33#include <inttypes.h>
34#include <stdlib.h>
35#include <string.h>
36#include <unistd.h>
37#include <errno.h>

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

252 if (!strcmp(name, "stripeoffset") && mt->provider != NULL) {
253 mt->provider->lg_stripeoffset = strtoumax(p, NULL, 0);
254 free(p);
255 return;
256 }
257
258 if (!strcmp(name, "config")) {
259 mt->config = NULL;
260 free(p);
260 return;
261 }
262
263 if (mt->config != NULL || (!strcmp(name, "wither") &&
264 (mt->provider != NULL || mt->geom != NULL))) {
265 if (mt->config != NULL)
266 c = mt->config;
267 else if (mt->provider != NULL)

--- 261 unchanged lines hidden ---
261 return;
262 }
263
264 if (mt->config != NULL || (!strcmp(name, "wither") &&
265 (mt->provider != NULL || mt->geom != NULL))) {
266 if (mt->config != NULL)
267 c = mt->config;
268 else if (mt->provider != NULL)

--- 261 unchanged lines hidden ---