From e1f0b91c5fd6b11e258464994868be8020c89e89 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 11 Apr 2011 17:24:13 +0200
Subject: libsmbconf: Convert smbconf_transaction_*() to sbcErr.

Signed-off-by: Michael Adam <obnox@samba.org>
---
 lib/smbconf/smbconf.c         |  6 +++---
 lib/smbconf/smbconf.h         |  6 +++---
 lib/smbconf/smbconf_private.h |  6 +++---
 lib/smbconf/smbconf_txt.c     | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'lib/smbconf')

diff --git a/lib/smbconf/smbconf.c b/lib/smbconf/smbconf.c
index 54aaa22f6e..c81af36cdb 100644
--- a/lib/smbconf/smbconf.c
+++ b/lib/smbconf/smbconf.c
@@ -422,17 +422,17 @@ sbcErr smbconf_delete_global_includes(struct smbconf_ctx *ctx)
 	return err;
 }
 
-WERROR smbconf_transaction_start(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx)
 {
 	return ctx->ops->transaction_start(ctx);
 }
 
-WERROR smbconf_transaction_commit(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx)
 {
 	return ctx->ops->transaction_commit(ctx);
 }
 
-WERROR smbconf_transaction_cancel(struct smbconf_ctx *ctx)
+sbcErr smbconf_transaction_cancel(struct smbconf_ctx *ctx)
 {
 	return ctx->ops->transaction_cancel(ctx);
 }
diff --git a/lib/smbconf/smbconf.h b/lib/smbconf/smbconf.h
index 798db5b423..f5dd922ed1 100644
--- a/lib/smbconf/smbconf.h
+++ b/lib/smbconf/smbconf.h
@@ -127,8 +127,8 @@ sbcErr smbconf_set_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);
-WERROR smbconf_transaction_cancel(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_start(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_commit(struct smbconf_ctx *ctx);
+sbcErr smbconf_transaction_cancel(struct smbconf_ctx *ctx);
 
 #endif /*  _LIBSMBCONF_H_  */
diff --git a/lib/smbconf/smbconf_private.h b/lib/smbconf/smbconf_private.h
index 6672a50de1..e768c30b91 100644
--- a/lib/smbconf/smbconf_private.h
+++ b/lib/smbconf/smbconf_private.h
@@ -68,9 +68,9 @@ struct smbconf_ops {
 			       uint32_t num_includes, const char **includes);
 	sbcErr (*delete_includes)(struct smbconf_ctx *ctx,
 				  const char *service);
-	WERROR (*transaction_start)(struct smbconf_ctx *ctx);
-	WERROR (*transaction_commit)(struct smbconf_ctx *ctx);
-	WERROR (*transaction_cancel)(struct smbconf_ctx *ctx);
+	sbcErr (*transaction_start)(struct smbconf_ctx *ctx);
+	sbcErr (*transaction_commit)(struct smbconf_ctx *ctx);
+	sbcErr (*transaction_cancel)(struct smbconf_ctx *ctx);
 };
 
 struct smbconf_ctx {
diff --git a/lib/smbconf/smbconf_txt.c b/lib/smbconf/smbconf_txt.c
index f6194db518..5c4bd27b9d 100644
--- a/lib/smbconf/smbconf_txt.c
+++ b/lib/smbconf/smbconf_txt.c
@@ -608,19 +608,19 @@ static sbcErr smbconf_txt_delete_includes(struct smbconf_ctx *ctx,
 	return SBC_ERR_NOT_SUPPORTED;
 }
 
-static WERROR smbconf_txt_transaction_start(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_start(struct smbconf_ctx *ctx)
 {
-	return WERR_OK;
+	return SBC_ERR_OK;
 }
 
-static WERROR smbconf_txt_transaction_commit(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_commit(struct smbconf_ctx *ctx)
 {
-	return WERR_OK;
+	return SBC_ERR_OK;
 }
 
-static WERROR smbconf_txt_transaction_cancel(struct smbconf_ctx *ctx)
+static sbcErr smbconf_txt_transaction_cancel(struct smbconf_ctx *ctx)
 {
-	return WERR_OK;
+	return SBC_ERR_OK;
 }
 
 static struct smbconf_ops smbconf_ops_txt = {
-- 
cgit