diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-16 13:19:31 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:30 -0500 |
| commit | 2438b90b32716a07589ccb5d747969c2bce974de (patch) | |
| tree | 7a4b33fce0367dd6ba515b575aa2542498764aec | |
| parent | 249f7260da146b7a3cafe83fb9f60a42f75f582e (diff) | |
| download | samba-2438b90b32716a07589ccb5d747969c2bce974de.tar.gz samba-2438b90b32716a07589ccb5d747969c2bce974de.tar.bz2 samba-2438b90b32716a07589ccb5d747969c2bce974de.zip | |
r14473: Modern splint has no problems with immediate structures.
(This used to be commit 6046dd822078cf5daa1a00c90fab998608e6872a)
| -rw-r--r-- | source4/libcli/util/nt_status.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source4/libcli/util/nt_status.h b/source4/libcli/util/nt_status.h index a805a1cfbd..fe1dbf866d 100644 --- a/source4/libcli/util/nt_status.h +++ b/source4/libcli/util/nt_status.h @@ -22,37 +22,19 @@ #ifndef _NT_STATUS_H #define _NT_STATUS_H -/* The Splint code analysis tool doesn't like immediate structures. */ - -#ifdef _SPLINT_ /* http://www.splint.org */ -#undef HAVE_IMMEDIATE_STRUCTURES -#endif - /* the following rather strange looking definitions of NTSTATUS and WERROR and there in order to catch common coding errors where different error types are mixed up. This is especially important as we slowly convert Samba from using BOOL for internal functions */ -#if defined(HAVE_IMMEDIATE_STRUCTURES) typedef struct {uint32_t v;} NTSTATUS; #define NT_STATUS(x) ((NTSTATUS) { x }) #define NT_STATUS_V(x) ((x).v) -#else -typedef uint32_t NTSTATUS; -#define NT_STATUS(x) (x) -#define NT_STATUS_V(x) (x) -#endif -#if defined(HAVE_IMMEDIATE_STRUCTURES) typedef struct {uint32_t v;} WERROR; #define W_ERROR(x) ((WERROR) { x }) #define W_ERROR_V(x) ((x).v) -#else -typedef uint32_t WERROR; -#define W_ERROR(x) (x) -#define W_ERROR_V(x) (x) -#endif #define NT_STATUS_IS_OK(x) (NT_STATUS_V(x) == 0) #define NT_STATUS_IS_ERR(x) ((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000) |