From 72d15f0c03cd67d32feb51f41238401b38344907 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 11 Apr 2011 16:01:22 +0200 Subject: libsmbconf: Convert smbconf_delete_includes() to sbcErr. Signed-off-by: Michael Adam --- lib/smbconf/smbconf.c | 11 +++++------ lib/smbconf/smbconf.h | 4 ++-- lib/smbconf/smbconf_private.h | 2 +- lib/smbconf/smbconf_txt.c | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) (limited to 'lib/smbconf') diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c index c3ba106d1c..54aaa22f6e 100644 --- a/lib/smbconf/smbconf.c +++ b/lib/smbconf/smbconf.c @@ -404,23 +404,22 @@ sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx, } -WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service) +sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service) { return ctx->ops->delete_includes(ctx, service); } -WERROR smbconf_delete_global_includes(struct smbconf_ctx *ctx) +sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx) { - WERROR werr; sbcErr err; err = smbconf_global_check(ctx); if (!SBC_ERROR_IS_OK(err)) { - return WERR_GENERAL_FAILURE; + return err; } - werr = smbconf_delete_includes(ctx, GLOBAL_NAME); + err = smbconf_delete_includes(ctx, GLOBAL_NAME); - return werr; + return err; } WERROR smbconf_transaction_start(struct smbconf_ctx *ctx) diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h index 8921af4108..798db5b423 100644 --- a/lib/smbconf/smbconf.h +++ b/lib/smbconf/smbconf.h @@ -124,8 +124,8 @@ sbcErr smbconf_set_includes(struct smbconf_ctx *ctx, sbcErr smbconf_set_global_includes(struct smbconf_ctx *ctx, uint32_t num_includes, const char **includes); -WERROR smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service); -WERROR smbconf_delete_global_includes(struct smbconf_ctx *ctx); +sbcErr smbconf_delete_includes(struct smbconf_ctx *ctx, const char *service); +sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx); WERROR smbconf_transaction_start(struct smbconf_ctx *ctx); WERROR smbconf_transaction_commit(struct smbconf_ctx *ctx); diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h index 1cb8b88d13..6672a50de1 100644 --- a/lib/smbconf/smbconf_private.h +++ b/lib/smbconf/smbconf_private.h @@ -66,7 +66,7 @@ struct smbconf_ops { sbcErr (*set_includes)(struct smbconf_ctx *ctx, const char *service, uint32_t num_includes, const char **includes); - WERROR (*delete_includes)(struct smbconf_ctx *ctx, + sbcErr (*delete_includes)(struct smbconf_ctx *ctx, const char *service); WERROR (*transaction_start)(struct smbconf_ctx *ctx); WERROR (*transaction_commit)(struct smbconf_ctx *ctx); diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c index 5502167593..f6194db518 100644 --- a/lib/smbconf/smbconf_txt.c +++ b/lib/smbconf/smbconf_txt.c @@ -602,10 +602,10 @@ static sbcErr smbconf_txt_set_includes(struct smbconf_ctx *ctx, return SBC_ERR_NOT_SUPPORTED; } -static WERROR smbconf_txt_delete_includes(struct smbconf_ctx *ctx, +static sbcErr smbconf_txt_delete_includes(struct smbconf_ctx *ctx, const char *service) { - return WERR_NOT_SUPPORTED; + return SBC_ERR_NOT_SUPPORTED; } static WERROR smbconf_txt_transaction_start(struct smbconf_ctx *ctx) -- cgit