Deleted Added
full compact
nfsdumpstate.c (192811) nfsdumpstate.c (193070)
1/*-
2 * Copyright (c) 2009 Rick Macklem, University of Guelph
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 * 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
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2009 Rick Macklem, University of Guelph
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 * 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
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/usr.sbin/nfsdumpstate/nfsdumpstate.c 192811 2009-05-26 15:19:04Z rmacklem $");
29__FBSDID("$FreeBSD: head/usr.sbin/nfsdumpstate/nfsdumpstate.c 193070 2009-05-29 22:19:45Z delphij $");
30
31#include <sys/param.h>
32#include <sys/linker.h>
33#include <sys/module.h>
34#include <sys/socket.h>
35
36#include <arpa/inet.h>
37

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

189 NFSLCK_DELEGWRITE))
190 printf("%-11s %9d %08x %08x %08x ",
191 deleg_flags(lp[cnt].ndlck_flags),
192 lp[cnt].ndlck_stateid.seqid,
193 lp[cnt].ndlck_stateid.other[0],
194 lp[cnt].ndlck_stateid.other[1],
195 lp[cnt].ndlck_stateid.other[2]);
196 else
30
31#include <sys/param.h>
32#include <sys/linker.h>
33#include <sys/module.h>
34#include <sys/socket.h>
35
36#include <arpa/inet.h>
37

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

189 NFSLCK_DELEGWRITE))
190 printf("%-11s %9d %08x %08x %08x ",
191 deleg_flags(lp[cnt].ndlck_flags),
192 lp[cnt].ndlck_stateid.seqid,
193 lp[cnt].ndlck_stateid.other[0],
194 lp[cnt].ndlck_stateid.other[1],
195 lp[cnt].ndlck_stateid.other[2]);
196 else
197 printf("%-11s %17lld %17lld ",
197 printf("%-11s %17jd %17jd ",
198 lock_flags(lp[cnt].ndlck_flags),
199 lp[cnt].ndlck_first,
200 lp[cnt].ndlck_end);
201 if (lp[cnt].ndlck_addrfam == AF_INET)
202 printf("%-15s ",
203 inet_ntoa(lp[cnt].ndlck_cbaddr.sin_addr));
204 else
205 printf("%-15s ", " ");

--- 75 unchanged lines hidden ---
198 lock_flags(lp[cnt].ndlck_flags),
199 lp[cnt].ndlck_first,
200 lp[cnt].ndlck_end);
201 if (lp[cnt].ndlck_addrfam == AF_INET)
202 printf("%-15s ",
203 inet_ntoa(lp[cnt].ndlck_cbaddr.sin_addr));
204 else
205 printf("%-15s ", " ");

--- 75 unchanged lines hidden ---