mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
r22227: merge from samba4:
move discard_const macros to librelace
metze
(This used to be commit 8f4a39127f
)
This commit is contained in:
parent
0ca5717a9a
commit
f5b7197625
@ -79,6 +79,29 @@
|
||||
#include <stddef.h>
|
||||
#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.
|
||||
*/
|
||||
#define discard_const(ptr) ((void *)((intptr_t)(ptr)))
|
||||
|
||||
/** Type-safe version of discard_const */
|
||||
#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
|
||||
|
||||
#ifndef HAVE_STRERROR
|
||||
extern char *sys_errlist[];
|
||||
#define strerror(i) sys_errlist[i]
|
||||
|
@ -974,7 +974,7 @@ strptime_internal (rp, fmt, tm, decided, era_cnt)
|
||||
if (want_xday && !have_yday)
|
||||
day_of_the_year (tm);
|
||||
|
||||
return (char *) rp;
|
||||
return discard_const_p(char, rp);
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user