Deleted Added
full compact
convtbl.c (131575) convtbl.c (164636)
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 131575 2004-07-04 16:11:03Z stefanf $
28 * $FreeBSD: head/usr.bin/systat/convtbl.c 164636 2006-11-26 20:08:40Z yar $
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */

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

64 if (idx == SC_AUTO)
65 /*
66 * Simple but elegant algorithm. Count how many times
67 * we can shift our size value right by a factor of ten,
68 * incrementing an index each time. We then use the
69 * index as the array index into the conversion table.
70 */
71 for (tmp = size, idx = SC_KILOBYTE;
29 */
30
31#include <sys/types.h>
32#include <unistd.h>
33#include "convtbl.h"
34
35struct convtbl convtbl[] = {
36 /* mul, scale, str */

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

64 if (idx == SC_AUTO)
65 /*
66 * Simple but elegant algorithm. Count how many times
67 * we can shift our size value right by a factor of ten,
68 * incrementing an index each time. We then use the
69 * index as the array index into the conversion table.
70 */
71 for (tmp = size, idx = SC_KILOBYTE;
72 tmp >= MEGA && idx <= SC_GIGABYTE;
72 tmp >= MEGA && idx < SC_GIGABYTE;
73 tmp >>= 10, idx++);
74
75 tbl_ptr = &convtbl[idx];
76 return tbl_ptr;
77}
78
79double
80convert(const u_long size, const u_int scale)

--- 18 unchanged lines hidden ---
73 tmp >>= 10, idx++);
74
75 tbl_ptr = &convtbl[idx];
76 return tbl_ptr;
77}
78
79double
80convert(const u_long size, const u_int scale)

--- 18 unchanged lines hidden ---