From d620f462ffe551e7720efc18e48866eed4b97d41 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 23 Mar 2015 11:32:55 +0100 Subject: [PATCH] libcli/util: let WERR_UNKNOWN_LEVEL be an alias to WERR_INVALID_LEVEL WERR_INVALID_LEVEL is the documented name that should be printed in logs. Signed-off-by: Stefan Metzmacher Reviewed-by: Guenther Deschner --- libcli/util/doserr.c | 1 - libcli/util/werror.h | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c index f16db42860e..124d4c5801d 100644 --- a/libcli/util/doserr.c +++ b/libcli/util/doserr.c @@ -46,7 +46,6 @@ static const struct werror_code_struct dos_errs[] = { "WERR_BAD_PASSWORD", WERR_BAD_PASSWORD }, { "WERR_NOMEM", WERR_NOMEM }, { "WERR_INVALID_NAME", WERR_INVALID_NAME }, - { "WERR_UNKNOWN_LEVEL", WERR_UNKNOWN_LEVEL }, { "WERR_OBJECT_PATH_INVALID", WERR_OBJECT_PATH_INVALID }, { "WERR_ALREADY_EXISTS", WERR_ALREADY_EXISTS }, { "WERR_NO_MORE_ITEMS", WERR_NO_MORE_ITEMS }, diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 4c14b7f2b20..7e13f5da949 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -104,7 +104,6 @@ typedef uint32_t WERROR; #define WERR_SEM_TIMEOUT W_ERROR(0x00000079) #define WERR_INSUFFICIENT_BUFFER W_ERROR(0x0000007A) #define WERR_INVALID_NAME W_ERROR(0x0000007B) -#define WERR_UNKNOWN_LEVEL W_ERROR(0x0000007C) #define WERR_OBJECT_PATH_INVALID W_ERROR(0x000000A1) #define WERR_ALREADY_EXISTS W_ERROR(0x000000B7) #define WERR_MORE_DATA W_ERROR(0x000000EA) @@ -261,6 +260,9 @@ typedef uint32_t WERROR; /* Generic error code aliases */ #define WERR_FOOBAR WERR_GENERAL_FAILURE +/* TODO: remove WERR_UNKNOWN_LEVEL in all callers */ +#define WERR_UNKNOWN_LEVEL WERR_INVALID_LEVEL + /***************************************************************************** Auto-generated Win32 error from: http://msdn.microsoft.com/en-us/library/cc231199%28PROT.10%29.aspx