Deleted Added
full compact
gvinum.c (220370) gvinum.c (227489)
1/*
2 * Copyright (c) 2004 Lukas Ertl
3 * Copyright (c) 2005 Chris Jones
4 * Copyright (c) 2007 Ulf Lilleengen
5 * All rights reserved.
6 *
7 * Portions of this software were developed for the FreeBSD Project
8 * by Chris Jones thanks to the support of Google's Summer of Code

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

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
1/*
2 * Copyright (c) 2004 Lukas Ertl
3 * Copyright (c) 2005 Chris Jones
4 * Copyright (c) 2007 Ulf Lilleengen
5 * All rights reserved.
6 *
7 * Portions of this software were developed for the FreeBSD Project
8 * by Chris Jones thanks to the support of Google's Summer of Code

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

24 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
25 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
26 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
28 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
29 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
30 * SUCH DAMAGE.
31 *
32 * $FreeBSD: head/sbin/gvinum/gvinum.c 220370 2011-04-05 18:41:01Z obrien $
32 * $FreeBSD: head/sbin/gvinum/gvinum.c 227489 2011-11-13 17:06:33Z eadler $
33 */
34
35#include <sys/param.h>
36#include <sys/linker.h>
37#include <sys/lock.h>
38#include <sys/module.h>
39#include <sys/mutex.h>
40#include <sys/queue.h>

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

552 ptr = strsep(&line, " ");
553 return (ptr);
554 }
555 ptr = strsep(&line, " ");
556 }
557 return (NULL);
558}
559
33 */
34
35#include <sys/param.h>
36#include <sys/linker.h>
37#include <sys/lock.h>
38#include <sys/module.h>
39#include <sys/mutex.h>
40#include <sys/queue.h>

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

552 ptr = strsep(&line, " ");
553 return (ptr);
554 }
555 ptr = strsep(&line, " ");
556 }
557 return (NULL);
558}
559
560/* Find a free name for an object given a a prefix. */
560/* Find a free name for an object given a prefix. */
561char *
562find_name(const char *prefix, int type, int namelen)
563{
564 struct gctl_req *req;
565 char comment[1], buf[GV_CFG_LEN - 1], *name, *sname, *ptr;
566 const char *errstr;
567 int i, n, begin, len, conflict;
568 char line[1024];

--- 864 unchanged lines hidden ---
561char *
562find_name(const char *prefix, int type, int namelen)
563{
564 struct gctl_req *req;
565 char comment[1], buf[GV_CFG_LEN - 1], *name, *sname, *ptr;
566 const char *errstr;
567 int i, n, begin, len, conflict;
568 char line[1024];

--- 864 unchanged lines hidden ---