diff options
| author | Andreas Schneider <asn@samba.org> | 2011-04-08 10:28:17 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2011-05-10 19:13:20 +0200 |
| commit | 9082c7cee8805281d18bd9f2f0afed4260ee95a8 (patch) | |
| tree | a743afdae98e50ae97ef73e1f3bf33639782b4ea /lib/smbconf | |
| parent | 29eea4b09ad2e99504f42a3c29195fb4757792dd (diff) | |
| download | samba-9082c7cee8805281d18bd9f2f0afed4260ee95a8.tar.gz | |
libsmbconf: Convert smbconf_open() to sbcErr.
Signed-off-by: Michael Adam <obnox@samba.org>
Diffstat (limited to 'lib/smbconf')
| -rw-r--r-- | lib/smbconf/smbconf_private.h | 2 | ||||
| -rw-r--r-- | lib/smbconf/smbconf_txt.c | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h index 2b56367f6c7..26573274ee2 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 f7bae4e3152..1ee855c6413 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) |