From: Michael Adam <obnox@samba.org>
Date: Fri, 21 Mar 2008 00:04:57 +0000 (+0100)
Subject: libsmbconf: rename smbconf_close() to smbconf_shutdown().
X-Git-Tag: samba-3.3.0pre1~3196
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=797b26ad3fad27e085827efb61f6b4d8b37e93f0;p=thirdparty%2Fsamba.git

libsmbconf: rename smbconf_close() to smbconf_shutdown().

Michael
---

diff --git a/source/lib/netapi/serverinfo.c b/source/lib/netapi/serverinfo.c
index c5b0c2f709c..ffc5f6fd3ee 100644
--- a/source/lib/netapi/serverinfo.c
+++ b/source/lib/netapi/serverinfo.c
@@ -200,7 +200,7 @@ static WERROR NetServerSetInfoLocal_1005(struct libnetapi_ctx *ctx,
 					    info1005->comment);
 
  done:
-	smbconf_close(conf_ctx);
+	smbconf_shutdown(conf_ctx);
 	return werr;
 }
 
diff --git a/source/lib/smbconf/smbconf.c b/source/lib/smbconf/smbconf.c
index 47254be68dc..660cb6f79fd 100644
--- a/source/lib/smbconf/smbconf.c
+++ b/source/lib/smbconf/smbconf.c
@@ -792,7 +792,7 @@ struct smbconf_ops smbconf_ops_reg = {
  * that should be passed around in subsequent calls to the other
  * smbconf functions.
  *
- * After the work with the configuration is completed, smbconf_close()
+ * After the work with the configuration is completed, smbconf_shutdown()
  * should be called.
  */
 WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx)
@@ -829,7 +829,7 @@ fail:
 /**
  * Close the configuration.
  */
-void smbconf_close(struct smbconf_ctx *ctx)
+void smbconf_shutdown(struct smbconf_ctx *ctx)
 {
 	/* this also closes the registry (by destructor): */
 	TALLOC_FREE(ctx);
diff --git a/source/lib/smbconf/smbconf.h b/source/lib/smbconf/smbconf.h
index caa0240a14c..33fa82e8981 100644
--- a/source/lib/smbconf/smbconf.h
+++ b/source/lib/smbconf/smbconf.h
@@ -34,7 +34,7 @@ struct smbconf_csn {
  */
 
 WERROR smbconf_init(TALLOC_CTX *mem_ctx, struct smbconf_ctx **conf_ctx);
-void smbconf_close(struct smbconf_ctx *ctx);
+void smbconf_shutdown(struct smbconf_ctx *ctx);
 bool smbconf_changed(struct smbconf_ctx *ctx, struct smbconf_csn *csn,
 		     const char *service, const char *param);
 WERROR smbconf_drop(struct smbconf_ctx *ctx);
diff --git a/source/libnet/libnet_join.c b/source/libnet/libnet_join.c
index 7e3e9cc93ac..12081c3a10c 100644
--- a/source/libnet/libnet_join.c
+++ b/source/libnet/libnet_join.c
@@ -1233,7 +1233,7 @@ static WERROR do_join_modify_vals_config(struct libnet_JoinCtx *r)
 	}
 
  done:
-	smbconf_close(ctx);
+	smbconf_shutdown(ctx);
 	return werr;
 }
 
@@ -1258,7 +1258,7 @@ static WERROR do_unjoin_modify_vals_config(struct libnet_UnjoinCtx *r)
 	}
 
  done:
-	smbconf_close(ctx);
+	smbconf_shutdown(ctx);
 	return werr;
 }
 
diff --git a/source/utils/net_conf.c b/source/utils/net_conf.c
index 3af3bd08394..118196976db 100644
--- a/source/utils/net_conf.c
+++ b/source/utils/net_conf.c
@@ -897,7 +897,7 @@ static int net_conf_wrap_function(int (*fn)(struct smbconf_ctx *,
 
 	ret = fn(conf_ctx, argc, argv);
 
-	smbconf_close(conf_ctx);
+	smbconf_shutdown(conf_ctx);
 
 	return ret;
 }