diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-05-14 21:53:05 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-05-31 15:10:20 +1000 |
| commit | c004a932c45a4b343814eb2e3f2d611a2dfe7311 (patch) | |
| tree | 0d1ba093c795abc12d6931a8d7177be723fed3bf /libcli/util | |
| parent | 4ac4ad21084b0cd09261ca37199c2a89607f86eb (diff) | |
| download | samba-c004a932c45a4b343814eb2e3f2d611a2dfe7311.tar.gz samba-c004a932c45a4b343814eb2e3f2d611a2dfe7311.tar.bz2 samba-c004a932c45a4b343814eb2e3f2d611a2dfe7311.zip | |
libcli/util Remove ntstatus_check_dos_mapping
This has been set to true since the global loadparm was removed in
2008, and removes an #ifdef SAMBA_BUILD == 4
Andrew Bartlett
Diffstat (limited to 'libcli/util')
| -rw-r--r-- | libcli/util/ntstatus.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/libcli/util/ntstatus.h b/libcli/util/ntstatus.h index 2217b4cd89..13ce733ca3 100644 --- a/libcli/util/ntstatus.h +++ b/libcli/util/ntstatus.h @@ -648,9 +648,6 @@ const char *get_nt_error_c_code(void *mem_ctx, NTSTATUS nt_code); *****************************************************************************/ NTSTATUS nt_status_string_to_code(const char *nt_status_str); -/** Used by ntstatus_dos_equal: */ -extern bool ntstatus_check_dos_mapping; - /* we need these here for openchange */ #ifndef likely #define likely(x) (x) @@ -661,13 +658,7 @@ extern bool ntstatus_check_dos_mapping; #define NT_STATUS_IS_OK(x) (likely(NT_STATUS_V(x) == 0)) #define NT_STATUS_IS_ERR(x) (unlikely((NT_STATUS_V(x) & 0xc0000000) == 0xc0000000)) -/* checking for DOS error mapping here is ugly, but unfortunately the - alternative is a very intrusive rewrite of the torture code */ -#if _SAMBA_BUILD_ == 4 -#define NT_STATUS_EQUAL(x,y) (NT_STATUS_IS_DOS(x)||NT_STATUS_IS_DOS(y)?ntstatus_dos_equal(x,y):NT_STATUS_V(x) == NT_STATUS_V(y)) -#else #define NT_STATUS_EQUAL(x,y) (NT_STATUS_V(x) == NT_STATUS_V(y)) -#endif #define NT_STATUS_HAVE_NO_MEMORY(x) do { \ if (unlikely(!(x))) { \ |