diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/util/memory.h | 25 | ||||
| -rw-r--r-- | lib/util/util.h | 27 |
2 files changed, 25 insertions, 27 deletions
diff --git a/lib/util/memory.h b/lib/util/memory.h index de01492aa2..cfc13ab836 100644 --- a/lib/util/memory.h +++ b/lib/util/memory.h @@ -88,6 +88,31 @@ #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2))) #endif +/** + this is a warning hack. The idea is to use this everywhere that we + get the "discarding const" warning from gcc. That doesn't actually + fix the problem of course, but it means that when we do get to + cleaning them up we can do it by searching the code for + discard_const. + + It also means that other error types aren't as swamped by the noise + of hundreds of const warnings, so we are more likely to notice when + we get new errors. + Please only add more uses of this macro when you find it + _really_ hard to fix const warnings. Our aim is to eventually use + this function in only a very few places. + + Also, please call this via the discard_const_p() macro interface, as that + makes the return type safe. +*/ +#ifndef discard_const +#define discard_const(ptr) ((void *)((uintptr_t)(ptr))) +#endif + +/** Type-safe version of discard_const */ +#ifndef discard_const_p +#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) +#endif #endif /* _SAMBA_MEMORY_H_ */ diff --git a/lib/util/util.h b/lib/util/util.h index 4c9a223093..110286dbc8 100644 --- a/lib/util/util.h +++ b/lib/util/util.h @@ -46,33 +46,6 @@ extern const char *panic_action; #include "../lib/util/byteorder.h" /** - this is a warning hack. The idea is to use this everywhere that we - get the "discarding const" warning from gcc. That doesn't actually - fix the problem of course, but it means that when we do get to - cleaning them up we can do it by searching the code for - discard_const. - - It also means that other error types aren't as swamped by the noise - of hundreds of const warnings, so we are more likely to notice when - we get new errors. - - Please only add more uses of this macro when you find it - _really_ hard to fix const warnings. Our aim is to eventually use - this function in only a very few places. - - Also, please call this via the discard_const_p() macro interface, as that - makes the return type safe. -*/ -#ifndef discard_const -#define discard_const(ptr) ((void *)((uintptr_t)(ptr))) -#endif - -/** Type-safe version of discard_const */ -#ifndef discard_const_p -#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) -#endif - -/** * assert macros */ #define SMB_ASSERT(b) do { if (!(b)) { \ |