Deleted Added
full compact
convtbl.c (164637) convtbl.c (164664)
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 164637 2006-11-26 20:14:47Z yar $
28 * $FreeBSD: head/usr.bin/systat/convtbl.c 164664 2006-11-27 14:18:54Z yar $
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */
37 { BYTE, BYTES, "bytes" }, /* SC_BYTE (0) */
38 { BYTE, KILO, "KB" }, /* SC_KILOBYTE (1) */
39 { BYTE, MEGA, "MB" }, /* SC_MEGABYTE (2) */
40 { BYTE, GIGA, "GB" }, /* SC_GIGABYTE (3) */
37 [SC_BYTE] = { BYTE, BYTES, "bytes" },
38 [SC_KILOBYTE] = { BYTE, KILO, "KB" },
39 [SC_MEGABYTE] = { BYTE, MEGA, "MB" },
40 [SC_GIGABYTE] = { BYTE, GIGA, "GB" },
41
41
42 { BIT, BITS, "b" }, /* SC_BITS (4) */
43 { BIT, KILO, "Kb" }, /* SC_KILOBITS (5) */
44 { BIT, MEGA, "Mb" }, /* SC_MEGABITS (6) */
45 { BIT, GIGA, "Gb" }, /* SC_GIGABITS (7) */
42 [SC_BIT] = { BIT, BITS, "b" },
43 [SC_KILOBIT] = { BIT, KILO, "Kb" },
44 [SC_MEGABIT] = { BIT, MEGA, "Mb" },
45 [SC_GIGABIT] = { BIT, GIGA, "Gb" },
46
46
47 { 0, 0, "" } /* SC_AUTO (8) */
48
47 [SC_AUTO] = { 0, 0, "" }
49};
50
51
52static
53struct convtbl *
54get_tbl_ptr(const u_long size, const u_int scale)
55{
56 struct convtbl *tbl_ptr = NULL;

--- 42 unchanged lines hidden ---
48};
49
50
51static
52struct convtbl *
53get_tbl_ptr(const u_long size, const u_int scale)
54{
55 struct convtbl *tbl_ptr = NULL;

--- 42 unchanged lines hidden ---