Deleted Added
full compact
convtbl.c (126775) convtbl.c (131575)
1/*
2 * Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
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 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
1/*
2 * Copyright (c) 2003, Trent Nelson, <trent@arpa.com>.
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 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
21 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
22 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
23 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
24 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
25 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
26 * SUCH DAMAGE.
27 *
28 * $FreeBSD: head/usr.bin/systat/convtbl.c 126775 2004-03-09 11:57:28Z dwmalone $
28 * $FreeBSD: head/usr.bin/systat/convtbl.c 131575 2004-07-04 16:11:03Z stefanf $
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */

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

44 { BIT, MEGA, "Mb" }, /* SC_MEGABITS (6) */
45 { BIT, GIGA, "Gb" }, /* SC_GIGABITS (7) */
46
47 { 0, 0, "" } /* SC_AUTO (8) */
48
49};
50
51
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */

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

44 { BIT, MEGA, "Mb" }, /* SC_MEGABITS (6) */
45 { BIT, GIGA, "Gb" }, /* SC_GIGABITS (7) */
46
47 { 0, 0, "" } /* SC_AUTO (8) */
48
49};
50
51
52static __inline__
52static __inline
53struct convtbl *
54get_tbl_ptr(const u_long size, const u_int scale)
55{
56 struct convtbl *tbl_ptr = NULL;
57 u_long tmp = 0;
58 u_int idx = scale;
59
60 /* If our index is out of range, default to auto-scaling. */

--- 38 unchanged lines hidden ---
53struct convtbl *
54get_tbl_ptr(const u_long size, const u_int scale)
55{
56 struct convtbl *tbl_ptr = NULL;
57 u_long tmp = 0;
58 u_int idx = scale;
59
60 /* If our index is out of range, default to auto-scaling. */

--- 38 unchanged lines hidden ---