diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 12:24:35 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 12:24:35 +1100 |
| commit | 41760c18bdab20d526d32568531bdf7c88272879 (patch) | |
| tree | b2f421919501a3061afe40f0cb0980f86f448ea8 /libcli/util | |
| parent | 8249383efb2037bb234dd040ebe151329cc4feb9 (diff) | |
| parent | c8ea9d1f13096cd7f51e5972915a61ca65b56ac3 (diff) | |
| download | samba-41760c18bdab20d526d32568531bdf7c88272879.tar.gz samba-41760c18bdab20d526d32568531bdf7c88272879.tar.bz2 samba-41760c18bdab20d526d32568531bdf7c88272879.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema
Diffstat (limited to 'libcli/util')
| -rw-r--r-- | libcli/util/doserr.c | 1 | ||||
| -rw-r--r-- | libcli/util/werror.h | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/libcli/util/doserr.c b/libcli/util/doserr.c index 1044ab351a..5104c3ee02 100644 --- a/libcli/util/doserr.c +++ b/libcli/util/doserr.c @@ -133,6 +133,7 @@ static const struct werror_code_struct dos_errs[] = { "WERR_NO_SPOOL_SPACE", WERR_NO_SPOOL_SPACE }, { "WERR_CAN_NOT_COMPLETE", WERR_CAN_NOT_COMPLETE }, { "WERR_INVALID_FLAGS", WERR_INVALID_FLAGS }, + { "WERR_DEVICE_NOT_CONNECTED", WERR_DEVICE_NOT_CONNECTED }, { "WERR_NOT_FOUND", WERR_NOT_FOUND }, { "WERR_SERVER_UNAVAILABLE", WERR_SERVER_UNAVAILABLE }, { "WERR_INVALID_USER_BUFFER", WERR_INVALID_USER_BUFFER }, diff --git a/libcli/util/werror.h b/libcli/util/werror.h index 4b34b14243..d92232706a 100644 --- a/libcli/util/werror.h +++ b/libcli/util/werror.h @@ -60,6 +60,18 @@ typedef uint32_t WERROR; }\ } while (0) +#define W_ERROR_NOT_OK_GOTO_DONE(x) do { \ + if (!W_ERROR_IS_OK(x)) {\ + goto done;\ + }\ +} while (0) + +#define W_ERROR_NOT_OK_GOTO(x, y) do {\ + if (!W_ERROR_IS_OK(x)) {\ + goto y;\ + }\ +} while(0) + /* these are win32 error codes. There are only a few places where these matter for Samba, primarily in the NT printing code */ #define WERR_OK W_ERROR(0) @@ -102,6 +114,7 @@ typedef uint32_t WERROR; #define WERR_SERVICE_ALREADY_RUNNING W_ERROR(1056) #define WERR_SERVICE_DISABLED W_ERROR(1058) #define WERR_SERVICE_NEVER_STARTED W_ERROR(1077) +#define WERR_DEVICE_NOT_CONNECTED W_ERROR(1167) #define WERR_NOT_FOUND W_ERROR(1168) #define WERR_INVALID_COMPUTERNAME W_ERROR(1210) #define WERR_INVALID_DOMAINNAME W_ERROR(1212) |