diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2008-07-07 10:14:15 +1000 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2008-07-14 12:36:08 -0500 |
| commit | 1409097db8be6ba662e3808654671554c5803bf0 (patch) | |
| tree | 1ec978e791206ecb3bf2d820022059662eb6eaf8 /libfdt/libfdt_internal.h | |
| parent | 36786db6154533b67d736b414ef63b4457009326 (diff) | |
| download | dtc-1409097db8be6ba662e3808654671554c5803bf0.zip dtc-1409097db8be6ba662e3808654671554c5803bf0.tar.gz dtc-1409097db8be6ba662e3808654671554c5803bf0.tar.bz2 | |
dtc: Enable and fix -Wcast-qual warnings
Enabling -Wcast-qual warnings in dtc shows up a number of places where
we are incorrectly discarding a const qualification. There are also
some places where we are intentionally discarding the 'const', and we
need an ugly cast through uintptr_t to suppress the warning. However,
most of these are pretty well isolated with the *_w() functions. So
in the interests of maximum safety with const qualifications, this
patch enables the warnings and fixes the existing complaints.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'libfdt/libfdt_internal.h')
| -rw-r--r-- | libfdt/libfdt_internal.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libfdt/libfdt_internal.h b/libfdt/libfdt_internal.h index 2ba30db..549e345 100644 --- a/libfdt/libfdt_internal.h +++ b/libfdt/libfdt_internal.h @@ -77,19 +77,20 @@ static inline const void *_fdt_offset_ptr(const void *fdt, int offset) static inline void *_fdt_offset_ptr_w(void *fdt, int offset) { - return (void *)_fdt_offset_ptr(fdt, offset); + return (void *)(uintptr_t)_fdt_offset_ptr(fdt, offset); } static inline const struct fdt_reserve_entry *_fdt_mem_rsv(const void *fdt, int n) { - const struct fdt_reserve_entry *rsv_table = (struct fdt_reserve_entry *) + const struct fdt_reserve_entry *rsv_table = + (const struct fdt_reserve_entry *) ((const char *)fdt + fdt_off_mem_rsvmap(fdt)); return rsv_table + n; } static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int n) { - return (void *)_fdt_mem_rsv(fdt, n); + return (void *)(uintptr_t)_fdt_mem_rsv(fdt, n); } #define SW_MAGIC (~FDT_MAGIC) |