[PATCH] Use the libfdt.h include as the interface definition

[David Gibson]

On Sun, Jan 27, 2013 at 09:35:22PM -0500, Gerald Van Baren wrote:
> libfdt.h is the libfdt interface definition.  It includes fdt.h and
> libfdt_env.h, so there is no reason to include those in the general code.
> 
> Signed-off-by: Gerald Van Baren <vanbaren at cideas.com>
> ---
> 
> No code changes, just cleaning up the #include situation WRT libfdt.h,
> fdt.h, and libfdt_env.h (the later two being redundant).
> 
> I looked at moving the fdt64_t, fdt32_t, fdt16_t definitions from
> libfdt_env.h to fdt.h.  I'm not sure this is a Good Thing[tm], but will
> send a separate patch for consideration and discussion.
> 
>  dtc.h                    |    3 +--
>  fdtdump.c                |    3 +--
>  libfdt/fdt.c             |    3 ---
>  libfdt/fdt_empty_tree.c  |    3 ---
>  libfdt/fdt_ro.c          |    3 ---
>  libfdt/fdt_rw.c          |    3 ---
>  libfdt/fdt_strerror.c    |    3 ---
>  libfdt/fdt_sw.c          |    3 ---
>  libfdt/fdt_wip.c         |    3 ---
>  libfdt/libfdt_internal.h |    1 -
>  10 files changed, 2 insertions(+), 26 deletions(-)
> 
> diff --git a/dtc.h b/dtc.h
> index 3e42a07..a032645 100644
> --- a/dtc.h
> +++ b/dtc.h
> @@ -32,8 +32,7 @@
>  #include <errno.h>
>  #include <unistd.h>
> 
> -#include <libfdt_env.h>
> -#include <fdt.h>
> +#include <libfdt.h>

For dtc.h, this is wrong - dtc uses the structures in fdt.h, but
(deliberately) nothing in libfdt.h.

For the other cases, I'm a bit undecided.  As you say, the individual
includes are redundant.  In some cases the explicit inclusions kind of
document that the C code has direct dependencies on the stuff in
libfdt_env.h and fdt.h as well as the indirect dependencies from the
libfdt.h API.  I'm not really sold either way.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.ozlabs.org/pipermail/devicetree-discuss/attachments/20130129/c8063626/attachment.sig>