GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dtc: Enable and fix -Wcast-qual warnings

Browse source 
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>
Acked-by: Gerald Van Baren <vanbaren@cideas.com>
This commit is contained in:
David Gibson 2008-07-07 10:14:15 +10:00 • committed by Gerald Van Baren
parent ef4e8ce1be
commit c66830263a
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/libfdt.h
View file

@ -125,7 +125,7 @@
const void *fdt_offset_ptr(const void *fdt, int offset, int checklen); const void *fdt_offset_ptr(const void *fdt, int offset, int checklen);
static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen) static inline void *fdt_offset_ptr_w(void *fdt, int offset, int checklen)
{ {
return (void *)fdt_offset_ptr(fdt, offset, checklen); return (void *)(uintptr_t)fdt_offset_ptr(fdt, offset, checklen);
} }
uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset); uint32_t fdt_next_tag(const void *fdt, int offset, int *nextoffset);
@ -375,8 +375,8 @@ static inline struct fdt_property *fdt_get_property_w(void *fdt, int nodeoffset,
const char *name, const char *name,
int *lenp) int *lenp)
{ {
return (struct fdt_property *)fdt_get_property(fdt, nodeoffset, return (struct fdt_property *)(uintptr_t)
name, lenp); fdt_get_property(fdt, nodeoffset, name, lenp);
} }
/** /**
@ -411,7 +411,7 @@ const void *fdt_getprop(const void *fdt, int nodeoffset,
static inline void *fdt_getprop_w(void *fdt, int nodeoffset, static inline void *fdt_getprop_w(void *fdt, int nodeoffset,
const char *name, int *lenp) const char *name, int *lenp)
{ {
return (void *)fdt_getprop(fdt, nodeoffset, name, lenp); return (void *)(uintptr_t)fdt_getprop(fdt, nodeoffset, name, lenp);
} }
/** /**

2
libfdt/fdt_ro.c
View file

@ -81,7 +81,7 @@ static int nodename_eq(const void *fdt, int offset,
const char *fdt_string(const void *fdt, int stroffset) const char *fdt_string(const void *fdt, int stroffset)
{ {
return (char *)fdt + fdt_off_dt_strings(fdt) + stroffset; return (const char *)fdt + fdt_off_dt_strings(fdt) + stroffset;
} }
int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size) int fdt_get_mem_rsv(const void *fdt, int n, uint64_t *address, uint64_t *size)

4
libfdt/fdt_rw.c
View file

@ -261,7 +261,7 @@ int fdt_set_name(void *fdt, int nodeoffset, const char *name)
RW_CHECK_HEADER(fdt); RW_CHECK_HEADER(fdt);
namep = (char *)fdt_get_name(fdt, nodeoffset, &oldlen); namep = (char *)(uintptr_t)fdt_get_name(fdt, nodeoffset, &oldlen);
if (!namep) if (!namep)
return oldlen; return oldlen;
@ -436,7 +436,7 @@ int fdt_open_into(const void *fdt, void *buf, int bufsize)
/* But if that overlaps with the old tree... */ /* But if that overlaps with the old tree... */
if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) { if (((tmp + newsize) > fdtstart) && (tmp < fdtend)) {
/* Try right after the old tree instead */ /* Try right after the old tree instead */
tmp = (char *)fdtend; tmp = (char *)(uintptr_t)fdtend;
if ((tmp + newsize) > ((char *)buf + bufsize)) if ((tmp + newsize) > ((char *)buf + bufsize))
return -FDT_ERR_NOSPACE; return -FDT_ERR_NOSPACE;
} }

7
libfdt/libfdt_internal.h
View file

@ -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) 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) 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)); ((const char *)fdt + fdt_off_mem_rsvmap(fdt));
return rsv_table + n; return rsv_table + n;
} }
static inline struct fdt_reserve_entry *_fdt_mem_rsv_w(void *fdt, int 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) #define SW_MAGIC (~FDT_MAGIC)