From 5aad7d9a874abf493b80737c67f6cffe9394b27e Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Mon, 26 Sep 2016 01:06:32 +0000 Subject: [PATCH] Avoid depending on the header for le*enc and be*enc. Not only is the header unportable, the encoding/decoding functions are as well. Instead, duplicate the handful of small inlines we need into a private header called endian.h. Aside: an alternative approach is to move the encoding/decoding functions to a separate system header. While the header is still nonportable, such an approach would make it possible to re-use the definitions by playing games with include paths. This may be the preferred approach if more (build) utilities need this. This change does not preclude that. In fact, it makes it easier. --- usr.bin/mkimg/apm.c | 2 +- usr.bin/mkimg/bsd.c | 2 +- usr.bin/mkimg/ebr.c | 2 +- usr.bin/mkimg/endian.h | 106 +++++++++++++++++++++++++++++++++++++++++ usr.bin/mkimg/gpt.c | 2 +- usr.bin/mkimg/mbr.c | 2 +- usr.bin/mkimg/pc98.c | 2 +- usr.bin/mkimg/qcow.c | 2 +- usr.bin/mkimg/raw.c | 1 - usr.bin/mkimg/vhd.c | 2 +- usr.bin/mkimg/vmdk.c | 2 +- usr.bin/mkimg/vtoc8.c | 2 +- 12 files changed, 116 insertions(+), 11 deletions(-) create mode 100644 usr.bin/mkimg/endian.h diff --git a/usr.bin/mkimg/apm.c b/usr.bin/mkimg/apm.c index de92cc0e9b92..2948faeeeab5 100644 --- a/usr.bin/mkimg/apm.c +++ b/usr.bin/mkimg/apm.c @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/bsd.c b/usr.bin/mkimg/bsd.c index 75e554f39b4f..2d52dd806d2e 100644 --- a/usr.bin/mkimg/bsd.c +++ b/usr.bin/mkimg/bsd.c @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/ebr.c b/usr.bin/mkimg/ebr.c index 526c494084cf..bbe9fa6c6990 100644 --- a/usr.bin/mkimg/ebr.c +++ b/usr.bin/mkimg/ebr.c @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/endian.h b/usr.bin/mkimg/endian.h new file mode 100644 index 000000000000..a8d31208db70 --- /dev/null +++ b/usr.bin/mkimg/endian.h @@ -0,0 +1,106 @@ +/*- + * Copyright (c) 2002 Thomas Moestl + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _MKIMG_ENDIAN_H_ +#define _MKIMG_ENDIAN_H_ + +static __inline uint16_t +be16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[0] << 8) | p[1]); +} + +static __inline void +be16enc(void *pp, uint16_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = (u >> 8) & 0xff; + p[1] = u & 0xff; +} + +static __inline void +be32enc(void *pp, uint32_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = (u >> 24) & 0xff; + p[1] = (u >> 16) & 0xff; + p[2] = (u >> 8) & 0xff; + p[3] = u & 0xff; +} + +static __inline void +be64enc(void *pp, uint64_t u) +{ + uint8_t *p = (uint8_t *)pp; + + be32enc(p, (uint32_t)(u >> 32)); + be32enc(p + 4, (uint32_t)(u & 0xffffffffU)); +} + +static __inline uint16_t +le16dec(const void *pp) +{ + uint8_t const *p = (uint8_t const *)pp; + + return ((p[1] << 8) | p[0]); +} + +static __inline void +le16enc(void *pp, uint16_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = u & 0xff; + p[1] = (u >> 8) & 0xff; +} + +static __inline void +le32enc(void *pp, uint32_t u) +{ + uint8_t *p = (uint8_t *)pp; + + p[0] = u & 0xff; + p[1] = (u >> 8) & 0xff; + p[2] = (u >> 16) & 0xff; + p[3] = (u >> 24) & 0xff; +} + +static __inline void +le64enc(void *pp, uint64_t u) +{ + uint8_t *p = (uint8_t *)pp; + + le32enc(p, (uint32_t)(u & 0xffffffffU)); + le32enc(p + 4, (uint32_t)(u >> 32)); +} + +#endif /* _MKIMG_ENDIAN_H_ */ diff --git a/usr.bin/mkimg/gpt.c b/usr.bin/mkimg/gpt.c index 678e63653760..d63c04ae93fe 100644 --- a/usr.bin/mkimg/gpt.c +++ b/usr.bin/mkimg/gpt.c @@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include @@ -39,6 +38,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/mbr.c b/usr.bin/mkimg/mbr.c index 071bcf5fe70d..72e67ad2727f 100644 --- a/usr.bin/mkimg/mbr.c +++ b/usr.bin/mkimg/mbr.c @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/pc98.c b/usr.bin/mkimg/pc98.c index 2db0394fb296..979d1b4dc934 100644 --- a/usr.bin/mkimg/pc98.c +++ b/usr.bin/mkimg/pc98.c @@ -29,12 +29,12 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h" diff --git a/usr.bin/mkimg/qcow.c b/usr.bin/mkimg/qcow.c index 64c437a9202c..b41c2d2da07d 100644 --- a/usr.bin/mkimg/qcow.c +++ b/usr.bin/mkimg/qcow.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -37,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "endian.h" #include "image.h" #include "format.h" #include "mkimg.h" diff --git a/usr.bin/mkimg/raw.c b/usr.bin/mkimg/raw.c index 759debf322bf..5686f79a6760 100644 --- a/usr.bin/mkimg/raw.c +++ b/usr.bin/mkimg/raw.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include diff --git a/usr.bin/mkimg/vhd.c b/usr.bin/mkimg/vhd.c index c4c1d1d45b8b..822c8fdd9f08 100644 --- a/usr.bin/mkimg/vhd.c +++ b/usr.bin/mkimg/vhd.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -36,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "endian.h" #include "image.h" #include "format.h" #include "mkimg.h" diff --git a/usr.bin/mkimg/vmdk.c b/usr.bin/mkimg/vmdk.c index 743418bbea97..0f963de5b2a0 100644 --- a/usr.bin/mkimg/vmdk.c +++ b/usr.bin/mkimg/vmdk.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -36,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "endian.h" #include "image.h" #include "format.h" #include "mkimg.h" diff --git a/usr.bin/mkimg/vtoc8.c b/usr.bin/mkimg/vtoc8.c index 2f5cf0f706e3..dfb499dedf39 100644 --- a/usr.bin/mkimg/vtoc8.c +++ b/usr.bin/mkimg/vtoc8.c @@ -28,7 +28,6 @@ __FBSDID("$FreeBSD$"); #include -#include #include #include #include @@ -36,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include "endian.h" #include "image.h" #include "mkimg.h" #include "scheme.h"