From 9082c7cee8805281d18bd9f2f0afed4260ee95a8 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 8 Apr 2011 10:28:17 +0200 Subject: libsmbconf: Convert smbconf_open() to sbcErr. Signed-off-by: Michael Adam --- lib/smbconf/smbconf_private.h | 2 +- lib/smbconf/smbconf_txt.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) (limited to 'lib/smbconf') diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h index 2b56367f6c..26573274ee 100644 --- a/lib/smbconf/smbconf_private.h +++ b/lib/smbconf/smbconf_private.h @@ -31,7 +31,7 @@ struct smbconf_ops { int (*shutdown)(struct smbconf_ctx *ctx); bool (*requires_messaging)(struct smbconf_ctx *ctx); bool (*is_writeable)(struct smbconf_ctx *ctx); - WERROR (*open_conf)(struct smbconf_ctx *ctx); + sbcErr (*open_conf)(struct smbconf_ctx *ctx); int (*close_conf)(struct smbconf_ctx *ctx); void (*get_csn)(struct smbconf_ctx *ctx, struct smbconf_csn *csn, const char *service, const char *param); diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c index f7bae4e315..1ee855c641 100644 --- a/lib/smbconf/smbconf_txt.c +++ b/lib/smbconf/smbconf_txt.c @@ -256,16 +256,9 @@ static bool smbconf_txt_is_writeable(struct smbconf_ctx *ctx) return false; } -static WERROR smbconf_txt_open(struct smbconf_ctx *ctx) +static sbcErr smbconf_txt_open(struct smbconf_ctx *ctx) { - sbcErr err; - - err = smbconf_txt_load_file(ctx); - if (!SBC_ERROR_IS_OK(err)) { - return WERR_GENERAL_FAILURE; - } - - return WERR_OK; + return smbconf_txt_load_file(ctx); } static int smbconf_txt_close(struct smbconf_ctx *ctx) -- cgit